diff --git a/src/googlechrome/devcontainer-feature.json b/src/google-chrome/devcontainer-feature.json
similarity index 67%
rename from src/googlechrome/devcontainer-feature.json
rename to src/google-chrome/devcontainer-feature.json
index 3a082fe..bfb1575 100644
--- a/src/googlechrome/devcontainer-feature.json
+++ b/src/google-chrome/devcontainer-feature.json
@@ -1,5 +1,5 @@
 {
-    "id": "chrome",
+    "id": "google-chrome",
     "version": "0.0.1",
     "name": "Google Chrome"
 }
\ No newline at end of file
diff --git a/src/googlechrome/install.sh b/src/google-chrome/install.sh
similarity index 100%
rename from src/googlechrome/install.sh
rename to src/google-chrome/install.sh
diff --git a/src/googlechrome/utils.sh b/src/google-chrome/utils.sh
similarity index 100%
rename from src/googlechrome/utils.sh
rename to src/google-chrome/utils.sh
diff --git a/src/packcli/devcontainer-feature.json b/src/pack-cli/devcontainer-feature.json
similarity index 91%
rename from src/packcli/devcontainer-feature.json
rename to src/pack-cli/devcontainer-feature.json
index 5fe58ef..a7f49a2 100644
--- a/src/packcli/devcontainer-feature.json
+++ b/src/pack-cli/devcontainer-feature.json
@@ -1,5 +1,5 @@
 {
-    "id": "packcli",
+    "id": "pack-cli",
     "version": "0.0.1",
     "name": "Cloud Native Buildpack CLI",
     "options": {
diff --git a/src/packcli/install.sh b/src/pack-cli/install.sh
similarity index 100%
rename from src/packcli/install.sh
rename to src/pack-cli/install.sh
diff --git a/src/packcli/utils.sh b/src/pack-cli/utils.sh
similarity index 100%
rename from src/packcli/utils.sh
rename to src/pack-cli/utils.sh