diff --git a/clientformat.go b/client_format.go
similarity index 100%
rename from clientformat.go
rename to client_format.go
diff --git a/clientmedia.go b/client_media.go
similarity index 100%
rename from clientmedia.go
rename to client_media.go
diff --git a/clientudpl.go b/client_udpl.go
similarity index 100%
rename from clientudpl.go
rename to client_udpl.go
diff --git a/emptytimer.go b/empty_timer.go
similarity index 100%
rename from emptytimer.go
rename to empty_timer.go
diff --git a/pkg/base/interleavedframe.go b/pkg/base/interleaved_frame.go
similarity index 100%
rename from pkg/base/interleavedframe.go
rename to pkg/base/interleaved_frame.go
diff --git a/pkg/base/interleavedframe_test.go b/pkg/base/interleaved_frame_test.go
similarity index 100%
rename from pkg/base/interleavedframe_test.go
rename to pkg/base/interleaved_frame_test.go
diff --git a/pkg/codecs/h264/dtsextractor.go b/pkg/codecs/h264/dts_extractor.go
similarity index 100%
rename from pkg/codecs/h264/dtsextractor.go
rename to pkg/codecs/h264/dts_extractor.go
diff --git a/pkg/codecs/h264/dtsextractor_test.go b/pkg/codecs/h264/dts_extractor_test.go
similarity index 100%
rename from pkg/codecs/h264/dtsextractor_test.go
rename to pkg/codecs/h264/dts_extractor_test.go
diff --git a/pkg/codecs/h264/emulationprevention.go b/pkg/codecs/h264/emulation_prevention.go
similarity index 100%
rename from pkg/codecs/h264/emulationprevention.go
rename to pkg/codecs/h264/emulation_prevention.go
diff --git a/pkg/codecs/h264/emulationprevention_test.go b/pkg/codecs/h264/emulation_prevention_test.go
similarity index 100%
rename from pkg/codecs/h264/emulationprevention_test.go
rename to pkg/codecs/h264/emulation_prevention_test.go
diff --git a/pkg/codecs/h264/nalutype.go b/pkg/codecs/h264/nalu_type.go
similarity index 100%
rename from pkg/codecs/h264/nalutype.go
rename to pkg/codecs/h264/nalu_type.go
diff --git a/pkg/codecs/h264/nalutype_test.go b/pkg/codecs/h264/nalu_type_test.go
similarity index 100%
rename from pkg/codecs/h264/nalutype_test.go
rename to pkg/codecs/h264/nalu_type_test.go
diff --git a/pkg/codecs/h265/dtsextractor.go b/pkg/codecs/h265/dts_extractor.go
similarity index 100%
rename from pkg/codecs/h265/dtsextractor.go
rename to pkg/codecs/h265/dts_extractor.go
diff --git a/pkg/codecs/h265/dtsextractor_test.go b/pkg/codecs/h265/dts_extractor_test.go
similarity index 100%
rename from pkg/codecs/h265/dtsextractor_test.go
rename to pkg/codecs/h265/dts_extractor_test.go
diff --git a/pkg/codecs/h265/nalutype.go b/pkg/codecs/h265/nalu_type.go
similarity index 100%
rename from pkg/codecs/h265/nalutype.go
rename to pkg/codecs/h265/nalu_type.go
diff --git a/pkg/codecs/h265/nalutype_test.go b/pkg/codecs/h265/nalu_type_test.go
similarity index 100%
rename from pkg/codecs/h265/nalutype_test.go
rename to pkg/codecs/h265/nalu_type_test.go
diff --git a/pkg/codecs/mpeg4audio/objecttype.go b/pkg/codecs/mpeg4audio/object_type.go
similarity index 100%
rename from pkg/codecs/mpeg4audio/objecttype.go
rename to pkg/codecs/mpeg4audio/object_type.go
diff --git a/pkg/codecs/mpeg4audio/samplerates.go b/pkg/codecs/mpeg4audio/sample_rates.go
similarity index 100%
rename from pkg/codecs/mpeg4audio/samplerates.go
rename to pkg/codecs/mpeg4audio/sample_rates.go
diff --git a/pkg/format/mpeg2audio.go b/pkg/format/mpeg2_audio.go
similarity index 100%
rename from pkg/format/mpeg2audio.go
rename to pkg/format/mpeg2_audio.go
diff --git a/pkg/format/mpeg2audio_test.go b/pkg/format/mpeg2_audio_test.go
similarity index 100%
rename from pkg/format/mpeg2audio_test.go
rename to pkg/format/mpeg2_audio_test.go
diff --git a/pkg/format/mpeg2video.go b/pkg/format/mpeg2_video.go
similarity index 100%
rename from pkg/format/mpeg2video.go
rename to pkg/format/mpeg2_video.go
diff --git a/pkg/format/mpeg2video_test.go b/pkg/format/mpeg2_video_test.go
similarity index 100%
rename from pkg/format/mpeg2video_test.go
rename to pkg/format/mpeg2_video_test.go
diff --git a/pkg/format/mpeg4audio.go b/pkg/format/mpeg4_audio.go
similarity index 100%
rename from pkg/format/mpeg4audio.go
rename to pkg/format/mpeg4_audio.go
diff --git a/pkg/format/mpeg4audio_test.go b/pkg/format/mpeg4_audio_test.go
similarity index 100%
rename from pkg/format/mpeg4audio_test.go
rename to pkg/format/mpeg4_audio_test.go
diff --git a/pkg/formatdecenc/rtplpcm/rtpsimpleaudio.go b/pkg/formatdecenc/rtplpcm/rtplpcm.go
similarity index 100%
rename from pkg/formatdecenc/rtplpcm/rtpsimpleaudio.go
rename to pkg/formatdecenc/rtplpcm/rtplpcm.go
diff --git a/serverconn.go b/server_conn.go
similarity index 100%
rename from serverconn.go
rename to server_conn.go
diff --git a/serverhandler.go b/server_handler.go
similarity index 100%
rename from serverhandler.go
rename to server_handler.go
diff --git a/servermulticasthandler.go b/server_multicast_handler.go
similarity index 100%
rename from servermulticasthandler.go
rename to server_multicast_handler.go
diff --git a/serversession.go b/server_session.go
similarity index 100%
rename from serversession.go
rename to server_session.go
diff --git a/serversessionformat.go b/server_session_format.go
similarity index 100%
rename from serversessionformat.go
rename to server_session_format.go
diff --git a/serversessionmedia.go b/server_session_media.go
similarity index 100%
rename from serversessionmedia.go
rename to server_session_media.go
diff --git a/serverstream.go b/server_stream.go
similarity index 100%
rename from serverstream.go
rename to server_stream.go
diff --git a/serverstreamformat.go b/server_stream_format.go
similarity index 100%
rename from serverstreamformat.go
rename to server_stream_format.go
diff --git a/serverstreammedia.go b/server_stream_media.go
similarity index 100%
rename from serverstreammedia.go
rename to server_stream_media.go
diff --git a/serverudpl.go b/server_udpl.go
similarity index 100%
rename from serverudpl.go
rename to server_udpl.go