diff --git a/servers.proto b/servers.proto
index 4a87c88..41d28aa 100644
--- a/servers.proto
+++ b/servers.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 option go_package = "git.itzana.me/strafesnet/go-grpc/servers";
 
 import "users.proto";
-import "maps.proto";
+import "maps_embedded.proto";
 
 package servers;
 
@@ -43,7 +43,7 @@ message ServerItem {
   string VipServerID = 4;
   users.UserResponse User = 5;
   int32 GameID = 6;
-  maps.MapResponse Map = 7;
+  maps_embedded.MapResponse Map = 7;
   int64 MapDate = 8;
   repeated int64 PlayerList = 9;
   int64 LastUpdate = 10;
@@ -77,4 +77,4 @@ message ServerListRequest {
 
 message NullResponse {
 
-}
\ No newline at end of file
+}
diff --git a/times.proto b/times.proto
index cdab41d..1f3730e 100644
--- a/times.proto
+++ b/times.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 import "users.proto";
-import "maps.proto";
+import "maps_embedded.proto";
 import "bots.proto";
 
 option go_package = "git.itzana.me/strafesnet/go-grpc/times";
@@ -45,7 +45,7 @@ message TimeResponse {
   int64 ID = 1;
   int64 Time = 2;
   users.UserResponse User = 3;
-  maps.MapResponse Map = 4;
+  maps_embedded.MapResponse Map = 4;
   optional bots.BotResponse Bot = 5;
   int64 Date = 6;
   int32 StyleID = 7;
@@ -100,4 +100,4 @@ message Pagination {
 
 message NullResponse {
 
-}
\ No newline at end of file
+}