diff --git a/master_server.py b/master_server.py
index ded9545..2bbeb1e 100644
--- a/master_server.py
+++ b/master_server.py
@@ -5,7 +5,7 @@ from gamespy_natneg_server import GameSpyNatNegServer
 from gamespy_qr_server import GameSpyQRServer
 from gamespy_server_browser_server import GameSpyServerBrowserServer
 from gamespy_gamestats_server import GameSpyGamestatsServer
-from nintendo_nas_server import NintendoNasServer
+from nas_server import NasServer
 from internal_stats_server import InternalStatsServer
 
 import gamespy.gs_database as gs_database
@@ -41,7 +41,7 @@ def start_natneg_server():
     natneg_server.start()
 
 def start_nas_server():
-    nas_server = NintendoNasServer()
+    nas_server = NasServer()
     nas_server.start()
 
 def start_stats_server():
diff --git a/nintendo_nas_server.py b/nintendo_nas_server.py
index 94389b9..46c1e9d 100644
--- a/nintendo_nas_server.py
+++ b/nintendo_nas_server.py
@@ -13,8 +13,8 @@ import other.utils as utils
 
 logger_output_to_console = True
 logger_output_to_file = True
-logger_name = "NintendoNasServer"
-logger_filename = "nintendo_nas_server.log"
+logger_name = "NasServer"
+logger_filename = "nas_server.log"
 logger = utils.create_logger(logger_name, logger_filename, -1, logger_output_to_console, logger_output_to_file)
 
 # if a game from this list requests a file listing, the server will return that only one exists and return a random one
@@ -24,18 +24,18 @@ gamecodes_return_random_file = ['ADAD', 'ADAE', 'ADAF', 'ADAI', 'ADAJ', 'ADAK',
 #address = ("0.0.0.0", 80)
 address = ("127.0.0.1", 9000)
 
-class NintendoNasServer(object):
+class NasServer(object):
     def start(self):
-        httpd = NintendoNasHTTPServer((address[0], address[1]), NintendoNasHTTPServerHandler)
+        httpd = NasHTTPServer((address[0], address[1]), NasHTTPServerHandler)
         logger.log(logging.INFO, "Now listening for connections on %s:%d...", address[0], address[1])
         httpd.serve_forever()
 
-class NintendoNasHTTPServer(BaseHTTPServer.HTTPServer):
+class NasHTTPServer(BaseHTTPServer.HTTPServer):
     def __init__(self, server_address, RequestHandlerClass):
         self.db = gs_database.GamespyDatabase()
         BaseHTTPServer.HTTPServer.__init__(self, server_address, RequestHandlerClass)
 
-class NintendoNasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class NasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     def do_POST(self):
         length = int(self.headers['content-length'])
         post = self.str_to_dict(self.rfile.read(length))
@@ -303,5 +303,5 @@ class NintendoNasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         return file_count
 
 if __name__ == "__main__":
-    nas = NintendoNasServer()
+    nas = NasServer()
     nas.start()