diff --git a/librespot/metadata/PlayableId.py b/librespot/metadata/PlayableId.py
index 6361203..ea05958 100644
--- a/librespot/metadata/PlayableId.py
+++ b/librespot/metadata/PlayableId.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 from librespot.common.Base62 import Base62
 # from librespot.metadata import EpisodeId, TrackId, UnsupportedId
-from librespot.proto.context_track_pb2 import ContextTrack
+from librespot.proto.ContextTrack import ContextTrack
 
 
 class PlayableId:
diff --git a/librespot/proto/canvaz_pb2.py b/librespot/proto/Canvaz.py
similarity index 99%
rename from librespot/proto/canvaz_pb2.py
rename to librespot/proto/Canvaz.py
index 8438ca0..2848283 100644
--- a/librespot/proto/canvaz_pb2.py
+++ b/librespot/proto/Canvaz.py
@@ -10,7 +10,7 @@ from google.protobuf import symbol_database as _symbol_database
 
 _sym_db = _symbol_database.Default()
 
-import canvaz_meta_pb2 as canvaz__meta__pb2
+import CanvazMeta as canvaz__meta__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
     name='canvaz.proto',
diff --git a/librespot/proto/canvaz_meta_pb2.py b/librespot/proto/CanvazMeta.py
similarity index 100%
rename from librespot/proto/canvaz_meta_pb2.py
rename to librespot/proto/CanvazMeta.py
diff --git a/librespot/proto/context_pb2.py b/librespot/proto/Context.py
similarity index 98%
rename from librespot/proto/context_pb2.py
rename to librespot/proto/Context.py
index 41b91ce..c50b5dd 100644
--- a/librespot/proto/context_pb2.py
+++ b/librespot/proto/Context.py
@@ -10,8 +10,8 @@ from google.protobuf import symbol_database as _symbol_database
 
 _sym_db = _symbol_database.Default()
 
-import context_page_pb2 as context__page__pb2
-import restrictions_pb2 as restrictions__pb2
+import ContextPage as context__page__pb2
+import Restrictions as restrictions__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
     name='context.proto',
diff --git a/librespot/proto/context_page_pb2.py b/librespot/proto/ContextPage.py
similarity index 99%
rename from librespot/proto/context_page_pb2.py
rename to librespot/proto/ContextPage.py
index e5fa14c..b852a73 100644
--- a/librespot/proto/context_page_pb2.py
+++ b/librespot/proto/ContextPage.py
@@ -10,7 +10,7 @@ from google.protobuf import symbol_database as _symbol_database
 
 _sym_db = _symbol_database.Default()
 
-import context_track_pb2 as context__track__pb2
+import ContextTrack as context__track__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
     name='context_page.proto',
diff --git a/librespot/proto/context_player_options_pb2.py b/librespot/proto/ContextPlayerOptions.py
similarity index 100%
rename from librespot/proto/context_player_options_pb2.py
rename to librespot/proto/ContextPlayerOptions.py
diff --git a/librespot/proto/context_track_pb2.py b/librespot/proto/ContextTrack.py
similarity index 100%
rename from librespot/proto/context_track_pb2.py
rename to librespot/proto/ContextTrack.py
diff --git a/librespot/proto/play_origin_pb2.py b/librespot/proto/PlayOrigin.py
similarity index 100%
rename from librespot/proto/play_origin_pb2.py
rename to librespot/proto/PlayOrigin.py
diff --git a/librespot/proto/playback_pb2.py b/librespot/proto/Playback.py
similarity index 99%
rename from librespot/proto/playback_pb2.py
rename to librespot/proto/Playback.py
index 7c40df4..60e72d1 100644
--- a/librespot/proto/playback_pb2.py
+++ b/librespot/proto/Playback.py
@@ -10,7 +10,7 @@ from google.protobuf import symbol_database as _symbol_database
 
 _sym_db = _symbol_database.Default()
 
-import context_track_pb2 as context__track__pb2
+import ContextTrack as context__track__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
     name='playback.proto',
diff --git a/librespot/proto/playlist4_external_pb2.py b/librespot/proto/Playlist4External.py
similarity index 100%
rename from librespot/proto/playlist4_external_pb2.py
rename to librespot/proto/Playlist4External.py
diff --git a/librespot/proto/playlist_annotate3_pb2.py b/librespot/proto/PlaylistAnnotate3.py
similarity index 100%
rename from librespot/proto/playlist_annotate3_pb2.py
rename to librespot/proto/PlaylistAnnotate3.py
diff --git a/librespot/proto/queue_pb2.py b/librespot/proto/Queue.py
similarity index 98%
rename from librespot/proto/queue_pb2.py
rename to librespot/proto/Queue.py
index 4e78d14..400b8eb 100644
--- a/librespot/proto/queue_pb2.py
+++ b/librespot/proto/Queue.py
@@ -10,7 +10,7 @@ from google.protobuf import symbol_database as _symbol_database
 
 _sym_db = _symbol_database.Default()
 
-import context_track_pb2 as context__track__pb2
+import ContextTrack as context__track__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
     name='queue.proto',
diff --git a/librespot/proto/restrictions_pb2.py b/librespot/proto/Restrictions.py
similarity index 100%
rename from librespot/proto/restrictions_pb2.py
rename to librespot/proto/Restrictions.py
diff --git a/librespot/proto/session_pb2.py b/librespot/proto/Session.py
similarity index 97%
rename from librespot/proto/session_pb2.py
rename to librespot/proto/Session.py
index 4b132bc..1f7d051 100644
--- a/librespot/proto/session_pb2.py
+++ b/librespot/proto/Session.py
@@ -10,9 +10,9 @@ from google.protobuf import symbol_database as _symbol_database
 
 _sym_db = _symbol_database.Default()
 
-import context_pb2 as context__pb2
-import context_player_options_pb2 as context__player__options__pb2
-import play_origin_pb2 as play__origin__pb2
+import Context as context__pb2
+import ContextPlayerOptions as context__player__options__pb2
+import PlayOrigin as play__origin__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
     name='session.proto',
diff --git a/librespot/proto/transfer_state_pb2.py b/librespot/proto/TransferState.py
similarity index 97%
rename from librespot/proto/transfer_state_pb2.py
rename to librespot/proto/TransferState.py
index b78d407..f42acfa 100644
--- a/librespot/proto/transfer_state_pb2.py
+++ b/librespot/proto/TransferState.py
@@ -10,10 +10,10 @@ from google.protobuf import symbol_database as _symbol_database
 
 _sym_db = _symbol_database.Default()
 
-import context_player_options_pb2 as context__player__options__pb2
-import playback_pb2 as playback__pb2
-import session_pb2 as session__pb2
-import queue_pb2 as queue__pb2
+import ContextPlayerOptions as context__player__options__pb2
+import Playback as playback__pb2
+import Session as session__pb2
+import Queue as queue__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
     name='transfer_state.proto',