diff --git a/steam/master_server.py b/steam/game_servers.py
similarity index 99%
rename from steam/master_server.py
rename to steam/game_servers.py
index 0ea4d7d..228cfed 100644
--- a/steam/master_server.py
+++ b/steam/game_servers.py
@@ -64,7 +64,7 @@ class MSServer:
     Source_27015 = ('208.64.200.65', 27015)          #: ``hl2master`` but on different port
 
 
-def query(filter_text=r'\napp\500', region=MSRegion.World, master=MSServer.Source):
+def query_master(filter_text=r'\napp\500', region=MSRegion.World, master=MSServer.Source):
     r"""Generator that returns (IP,port) pairs of serveras
 
     .. warning::