7 files changed, 20 insertions, 18 deletions
diff --git a/recipes-connectivity/connman/connman-conf_agldemo.inc b/recipes-connectivity/connman/connman-conf_agldemo.inc
index 5b732ae52..7b736ec6b 100644
--- a/recipes-connectivity/connman/connman-conf_agldemo.inc
+++ b/recipes-connectivity/connman/connman-conf_agldemo.inc
@@ -1,6 +1,6 @@
 do_install:append() {
     # Need to ignore eth1 in cluster demo setup
-    if ${@bb.utils.contains('AGL_FEATURES', 'agl-cluster-demo-support', 'true', 'false', d)}; then
+    if ${@bb.utils.contains('AGL_FEATURES', 'agl-demo-cluster-support', 'true', 'false', d)}; then
         sed -i 's/^\(NetworkInterfaceBlacklist=.*\)/\1,eth1/' ${D}${sysconfdir}/connman/main.conf
     fi
 }
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index 9c4553f29..fdebd24a6 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -39,7 +39,7 @@ CLUSTER_SUPPORT_PACKAGES = " \
 	tbtnavi \
 	cluster-demo-network-config \
 "
-CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-cluster-demo-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}"
+CLUSTER_SUPPORT = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-cluster-support", "${CLUSTER_SUPPORT_PACKAGES}", "",d)}"
 
 # Hook for demo platform configuration
 # ATM used for:
diff --git a/templates/feature/agl-cluster-demo-support/50_local.conf.inc b/templates/feature/agl-cluster-demo-support/50_local.conf.inc
deleted file mode 100644
index 0be5431bc..000000000
--- a/templates/feature/agl-cluster-demo-support/50_local.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-AGL_FEATURES:append = " agl-cluster-demo-support"
diff --git a/templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md b/templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md
deleted file mode 100644
index bdb04f0ba..000000000
--- a/templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-description: Feature agl-cluster-demo-support
-authors: Scott Murray <scott.murray@konsulko.com>
----
-	
-### Feature agl-cluster-demo-support
-	 
-*Description is missing - please complete file meta-agl-demo/templates/feature/agl-cluster-demo-support/README_feature_agl-cluster-demo-support.md*
-
-#### Dependent features pulled by agl-cluster-demo-support
-
-The following features are pulled:
-
-* agl-gstrecorder
-
diff --git a/templates/feature/agl-demo-cluster-support/50_local.conf.inc b/templates/feature/agl-demo-cluster-support/50_local.conf.inc
new file mode 100644
index 000000000..188d8e8e5
--- /dev/null
+++ b/templates/feature/agl-demo-cluster-support/50_local.conf.inc
@@ -0,0 +1 @@
+AGL_FEATURES:append = " agl-demo-cluster-support"
diff --git a/templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md b/templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md
new file mode 100644
index 000000000..a9ff2cfb5
--- /dev/null
+++ b/templates/feature/agl-demo-cluster-support/README_feature_agl-demo-cluster-support.md
@@ -0,0 +1,17 @@
+---
+description: Feature agl-demo-cluster-support
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+	
+### Feature agl-demo-cluster-support
+	 
+Enables support for remote navigation display on a connected board running
+the agl-cluster-demo-platform image.  The configuration is in large part
+intended for use with the AGL tradeshow demo setup.
+
+#### Dependent features pulled by agl-demo-cluster-support
+
+The following features are pulled:
+
+* agl-weston-remoting
+
diff --git a/templates/feature/agl-cluster-demo-support/included.dep b/templates/feature/agl-demo-cluster-support/included.dep
index 1e9b35fbf..1e9b35fbf 100644
--- a/templates/feature/agl-cluster-demo-support/included.dep
+++ b/templates/feature/agl-demo-cluster-support/included.dep