diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cbdf29dc7..b529d843e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -221,8 +221,8 @@ During the release process, all `./.chloggen/*.yaml` files are transcribed into
 1. Create an entry file using `make chlog-new`. The command generates a new file,
    with its name based on the current branch (e.g. `./.chloggen/my-feature-xyz.yaml`)
 2. Fill in all the fields in the generated file
-3. The value for the `component` field MUST match a filename (without type) in the
-   [registry](https://github.com/open-telemetry/semantic-conventions/tree/main/model/registry)
+3. The value for the `component` field MUST match a folder name in the
+   [model](https://github.com/open-telemetry/semantic-conventions/tree/main/model) directory
    (e.g. `browser`, `http`)
 4. Run `make chlog-validate` to ensure the new file is valid
 5. Commit and push the file
diff --git a/model/andrioid/deprecated/registry-deprecated.yaml b/model/android/deprecated/registry-deprecated.yaml
similarity index 100%
rename from model/andrioid/deprecated/registry-deprecated.yaml
rename to model/android/deprecated/registry-deprecated.yaml
diff --git a/model/andrioid/registry.yaml b/model/android/registry.yaml
similarity index 100%
rename from model/andrioid/registry.yaml
rename to model/android/registry.yaml
diff --git a/model/andrioid/resources.yaml b/model/android/resources.yaml
similarity index 100%
rename from model/andrioid/resources.yaml
rename to model/android/resources.yaml
diff --git a/model/graphgl/registry.yaml b/model/graphql/registry.yaml
similarity index 100%
rename from model/graphgl/registry.yaml
rename to model/graphql/registry.yaml
diff --git a/model/graphgl/spans.yml b/model/graphql/spans.yml
similarity index 100%
rename from model/graphgl/spans.yml
rename to model/graphql/spans.yml