diff --git a/README.md b/README.md
index e34d9bc8..9bcd2ae3 100644
--- a/README.md
+++ b/README.md
@@ -57,18 +57,18 @@ Features:
 
 * [client-query](examples/client-query/main.go)
 * [client-read](examples/client-read/main.go)
+* [client-read-codec-aac](examples/client-read-codec-aac/main.go)
+* [client-read-codec-h264](examples/client-read-codec-h264/main.go)
+* [client-read-codec-h264-convert-to-jpeg](examples/client-read-codec-h264-convert-to-jpeg/main.go)
+* [client-read-codec-h264-save-to-disk](examples/client-read-codec-h264-save-to-disk/main.go)
 * [client-read-partial](examples/client-read-partial/main.go)
 * [client-read-options](examples/client-read-options/main.go)
 * [client-read-pause](examples/client-read-pause/main.go)
-* [client-read-h264](examples/client-read-h264/main.go)
-* [client-read-h264-convert-to-jpeg](examples/client-read-h264-convert-to-jpeg/main.go)
-* [client-read-h264-save-to-disk](examples/client-read-h264-save-to-disk/main.go)
-* [client-read-aac](examples/client-read-aac/main.go)
 * [client-read-republish](examples/client-read-republish/main.go)
-* [client-publish-h264](examples/client-publish-h264/main.go)
-* [client-publish-pcmu](examples/client-publish-pcmu/main.go)
-* [client-publish-aac](examples/client-publish-aac/main.go)
-* [client-publish-opus](examples/client-publish-opus/main.go)
+* [client-publish-codec-aac](examples/client-publish-codec-aac/main.go)
+* [client-publish-codec-h264](examples/client-publish-codec-h264/main.go)
+* [client-publish-codec-opus](examples/client-publish-codec-opus/main.go)
+* [client-publish-codec-pcmu](examples/client-publish-codec-pcmu/main.go)
 * [client-publish-options](examples/client-publish-options/main.go)
 * [client-publish-pause](examples/client-publish-pause/main.go)
 * [server](examples/server/main.go)
diff --git a/examples/client-publish-aac/main.go b/examples/client-publish-codec-aac/main.go
similarity index 100%
rename from examples/client-publish-aac/main.go
rename to examples/client-publish-codec-aac/main.go
diff --git a/examples/client-publish-h264/main.go b/examples/client-publish-codec-h264/main.go
similarity index 100%
rename from examples/client-publish-h264/main.go
rename to examples/client-publish-codec-h264/main.go
diff --git a/examples/client-publish-opus/main.go b/examples/client-publish-codec-opus/main.go
similarity index 100%
rename from examples/client-publish-opus/main.go
rename to examples/client-publish-codec-opus/main.go
diff --git a/examples/client-publish-pcmu/main.go b/examples/client-publish-codec-pcmu/main.go
similarity index 100%
rename from examples/client-publish-pcmu/main.go
rename to examples/client-publish-codec-pcmu/main.go
diff --git a/examples/client-read-aac/main.go b/examples/client-read-codec-aac/main.go
similarity index 100%
rename from examples/client-read-aac/main.go
rename to examples/client-read-codec-aac/main.go
diff --git a/examples/client-read-h264-convert-to-jpeg/h264decoder.go b/examples/client-read-codec-h264-convert-to-jpeg/h264decoder.go
similarity index 100%
rename from examples/client-read-h264-convert-to-jpeg/h264decoder.go
rename to examples/client-read-codec-h264-convert-to-jpeg/h264decoder.go
diff --git a/examples/client-read-h264-convert-to-jpeg/main.go b/examples/client-read-codec-h264-convert-to-jpeg/main.go
similarity index 100%
rename from examples/client-read-h264-convert-to-jpeg/main.go
rename to examples/client-read-codec-h264-convert-to-jpeg/main.go
diff --git a/examples/client-read-h264-save-to-disk/main.go b/examples/client-read-codec-h264-save-to-disk/main.go
similarity index 100%
rename from examples/client-read-h264-save-to-disk/main.go
rename to examples/client-read-codec-h264-save-to-disk/main.go
diff --git a/examples/client-read-h264-save-to-disk/mpegtsmuxer.go b/examples/client-read-codec-h264-save-to-disk/mpegtsmuxer.go
similarity index 100%
rename from examples/client-read-h264-save-to-disk/mpegtsmuxer.go
rename to examples/client-read-codec-h264-save-to-disk/mpegtsmuxer.go
diff --git a/examples/client-read-h264/h264decoder.go b/examples/client-read-codec-h264/h264decoder.go
similarity index 100%
rename from examples/client-read-h264/h264decoder.go
rename to examples/client-read-codec-h264/h264decoder.go
diff --git a/examples/client-read-h264/main.go b/examples/client-read-codec-h264/main.go
similarity index 100%
rename from examples/client-read-h264/main.go
rename to examples/client-read-codec-h264/main.go