diff --git a/README.md b/README.md
index c261a082..dc84c497 100644
--- a/README.md
+++ b/README.md
@@ -69,32 +69,32 @@ Features:
 
 * [client-query](examples/client-query/main.go)
 * [client-read](examples/client-read/main.go)
-* [client-read-codec-g722](examples/client-read-codec-g722/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-codec-h265](examples/client-read-codec-h265/main.go)
-* [client-read-codec-lpcm](examples/client-read-codec-lpcm/main.go)
-* [client-read-codec-mpeg4audio](examples/client-read-codec-mpeg4audio/main.go)
-* [client-read-codec-opus](examples/client-read-codec-opus/main.go)
-* [client-read-codec-pcma](examples/client-read-codec-pcma/main.go)
-* [client-read-codec-vp8](examples/client-read-codec-vp8/main.go)
-* [client-read-codec-vp9](examples/client-read-codec-vp9/main.go)
-* [client-read-partial](examples/client-read-partial/main.go)
 * [client-read-options](examples/client-read-options/main.go)
+* [client-read-partial](examples/client-read-partial/main.go)
 * [client-read-pause](examples/client-read-pause/main.go)
 * [client-read-republish](examples/client-read-republish/main.go)
-* [client-publish-codec-g722](examples/client-publish-codec-g722/main.go)
-* [client-publish-codec-h264](examples/client-publish-codec-h264/main.go)
-* [client-publish-codec-h265](examples/client-publish-codec-h265/main.go)
-* [client-publish-codec-lpcm](examples/client-publish-codec-lpcm/main.go)
-* [client-publish-codec-mpeg4audio](examples/client-publish-codec-mpeg4audio/main.go)
-* [client-publish-codec-opus](examples/client-publish-codec-opus/main.go)
-* [client-publish-codec-pcma](examples/client-publish-codec-pcma/main.go)
-* [client-publish-codec-vp8](examples/client-publish-codec-vp8/main.go)
-* [client-publish-codec-vp9](examples/client-publish-codec-vp9/main.go)
+* [client-read-track-g711](examples/client-read-track-g711/main.go)
+* [client-read-track-g722](examples/client-read-track-g722/main.go)
+* [client-read-track-h264](examples/client-read-track-h264/main.go)
+* [client-read-track-h264-convert-to-jpeg](examples/client-read-track-h264-convert-to-jpeg/main.go)
+* [client-read-track-h264-save-to-disk](examples/client-read-track-h264-save-to-disk/main.go)
+* [client-read-track-h265](examples/client-read-track-h265/main.go)
+* [client-read-track-lpcm](examples/client-read-track-lpcm/main.go)
+* [client-read-track-mpeg4audio](examples/client-read-track-mpeg4audio/main.go)
+* [client-read-track-opus](examples/client-read-track-opus/main.go)
+* [client-read-track-vp8](examples/client-read-track-vp8/main.go)
+* [client-read-track-vp9](examples/client-read-track-vp9/main.go)
 * [client-publish-options](examples/client-publish-options/main.go)
 * [client-publish-pause](examples/client-publish-pause/main.go)
+* [client-publish-track-g711](examples/client-publish-track-g711/main.go)
+* [client-publish-track-g722](examples/client-publish-track-g722/main.go)
+* [client-publish-track-h264](examples/client-publish-track-h264/main.go)
+* [client-publish-track-h265](examples/client-publish-track-h265/main.go)
+* [client-publish-track-lpcm](examples/client-publish-track-lpcm/main.go)
+* [client-publish-track-mpeg4audio](examples/client-publish-track-mpeg4audio/main.go)
+* [client-publish-track-opus](examples/client-publish-track-opus/main.go)
+* [client-publish-track-vp8](examples/client-publish-track-vp8/main.go)
+* [client-publish-track-vp9](examples/client-publish-track-vp9/main.go)
 * [server](examples/server/main.go)
 * [server-tls](examples/server-tls/main.go)
 * [server-h264-save-to-disk](examples/server-h264-save-to-disk/main.go)
diff --git a/examples/client-publish-codec-g711/main.go b/examples/client-publish-track-g711/main.go
similarity index 100%
rename from examples/client-publish-codec-g711/main.go
rename to examples/client-publish-track-g711/main.go
diff --git a/examples/client-publish-codec-g722/main.go b/examples/client-publish-track-g722/main.go
similarity index 100%
rename from examples/client-publish-codec-g722/main.go
rename to examples/client-publish-track-g722/main.go
diff --git a/examples/client-publish-codec-h264/main.go b/examples/client-publish-track-h264/main.go
similarity index 100%
rename from examples/client-publish-codec-h264/main.go
rename to examples/client-publish-track-h264/main.go
diff --git a/examples/client-publish-codec-h265/main.go b/examples/client-publish-track-h265/main.go
similarity index 100%
rename from examples/client-publish-codec-h265/main.go
rename to examples/client-publish-track-h265/main.go
diff --git a/examples/client-publish-codec-lpcm/main.go b/examples/client-publish-track-lpcm/main.go
similarity index 100%
rename from examples/client-publish-codec-lpcm/main.go
rename to examples/client-publish-track-lpcm/main.go
diff --git a/examples/client-publish-codec-mpeg4audio/main.go b/examples/client-publish-track-mpeg4audio/main.go
similarity index 100%
rename from examples/client-publish-codec-mpeg4audio/main.go
rename to examples/client-publish-track-mpeg4audio/main.go
diff --git a/examples/client-publish-codec-opus/main.go b/examples/client-publish-track-opus/main.go
similarity index 100%
rename from examples/client-publish-codec-opus/main.go
rename to examples/client-publish-track-opus/main.go
diff --git a/examples/client-publish-codec-vp8/main.go b/examples/client-publish-track-vp8/main.go
similarity index 100%
rename from examples/client-publish-codec-vp8/main.go
rename to examples/client-publish-track-vp8/main.go
diff --git a/examples/client-publish-codec-vp9/main.go b/examples/client-publish-track-vp9/main.go
similarity index 100%
rename from examples/client-publish-codec-vp9/main.go
rename to examples/client-publish-track-vp9/main.go
diff --git a/examples/client-read-codec-g711/main.go b/examples/client-read-track-g711/main.go
similarity index 100%
rename from examples/client-read-codec-g711/main.go
rename to examples/client-read-track-g711/main.go
diff --git a/examples/client-read-codec-g722/main.go b/examples/client-read-track-g722/main.go
similarity index 100%
rename from examples/client-read-codec-g722/main.go
rename to examples/client-read-track-g722/main.go
diff --git a/examples/client-read-codec-h264-convert-to-jpeg/h264decoder.go b/examples/client-read-track-h264-convert-to-jpeg/h264decoder.go
similarity index 100%
rename from examples/client-read-codec-h264-convert-to-jpeg/h264decoder.go
rename to examples/client-read-track-h264-convert-to-jpeg/h264decoder.go
diff --git a/examples/client-read-codec-h264-convert-to-jpeg/main.go b/examples/client-read-track-h264-convert-to-jpeg/main.go
similarity index 100%
rename from examples/client-read-codec-h264-convert-to-jpeg/main.go
rename to examples/client-read-track-h264-convert-to-jpeg/main.go
diff --git a/examples/client-read-codec-h264-save-to-disk/main.go b/examples/client-read-track-h264-save-to-disk/main.go
similarity index 100%
rename from examples/client-read-codec-h264-save-to-disk/main.go
rename to examples/client-read-track-h264-save-to-disk/main.go
diff --git a/examples/client-read-codec-h264-save-to-disk/mpegtsmuxer.go b/examples/client-read-track-h264-save-to-disk/mpegtsmuxer.go
similarity index 100%
rename from examples/client-read-codec-h264-save-to-disk/mpegtsmuxer.go
rename to examples/client-read-track-h264-save-to-disk/mpegtsmuxer.go
diff --git a/examples/client-read-codec-h264/h264decoder.go b/examples/client-read-track-h264/h264decoder.go
similarity index 100%
rename from examples/client-read-codec-h264/h264decoder.go
rename to examples/client-read-track-h264/h264decoder.go
diff --git a/examples/client-read-codec-h264/main.go b/examples/client-read-track-h264/main.go
similarity index 100%
rename from examples/client-read-codec-h264/main.go
rename to examples/client-read-track-h264/main.go
diff --git a/examples/client-read-codec-h265/main.go b/examples/client-read-track-h265/main.go
similarity index 100%
rename from examples/client-read-codec-h265/main.go
rename to examples/client-read-track-h265/main.go
diff --git a/examples/client-read-codec-lpcm/main.go b/examples/client-read-track-lpcm/main.go
similarity index 100%
rename from examples/client-read-codec-lpcm/main.go
rename to examples/client-read-track-lpcm/main.go
diff --git a/examples/client-read-codec-mpeg4audio/main.go b/examples/client-read-track-mpeg4audio/main.go
similarity index 100%
rename from examples/client-read-codec-mpeg4audio/main.go
rename to examples/client-read-track-mpeg4audio/main.go
diff --git a/examples/client-read-codec-opus/main.go b/examples/client-read-track-opus/main.go
similarity index 100%
rename from examples/client-read-codec-opus/main.go
rename to examples/client-read-track-opus/main.go
diff --git a/examples/client-read-codec-vp8/main.go b/examples/client-read-track-vp8/main.go
similarity index 100%
rename from examples/client-read-codec-vp8/main.go
rename to examples/client-read-track-vp8/main.go
diff --git a/examples/client-read-codec-vp9/main.go b/examples/client-read-track-vp9/main.go
similarity index 100%
rename from examples/client-read-codec-vp9/main.go
rename to examples/client-read-track-vp9/main.go