diff --git a/data/ui/UberwriterWindow.ui b/data/ui/Window.ui
similarity index 100%
rename from data/ui/UberwriterWindow.ui
rename to data/ui/Window.ui
diff --git a/uberwriter/__init__.py b/uberwriter/__init__.py
index 20bd475..8632281 100644
--- a/uberwriter/__init__.py
+++ b/uberwriter/__init__.py
@@ -22,7 +22,7 @@ gi.require_version('Gtk', '3.0')
 from uberwriter import window
 from uberwriter import application
 from uberwriter.helpers import set_up_logging
-from uberwriter.uberwriterconfig import get_version
+from uberwriter.config import get_version
 
 
 def main():
diff --git a/uberwriter/uberwriterconfig.py b/uberwriter/config.py
similarity index 100%
rename from uberwriter/uberwriterconfig.py
rename to uberwriter/config.py
diff --git a/uberwriter/helpers.py b/uberwriter/helpers.py
index 9272c2b..e7f2c03 100644
--- a/uberwriter/helpers.py
+++ b/uberwriter/helpers.py
@@ -30,7 +30,7 @@ from uberwriter.settings import Settings
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk  # pylint: disable=E0611
 
-from uberwriter.uberwriterconfig import get_data_file
+from uberwriter.config import get_data_file
 from uberwriter.builder import Builder
 
 
diff --git a/uberwriter/sidebar.py b/uberwriter/sidebar.py
index ddc8536..16b7104 100644
--- a/uberwriter/sidebar.py
+++ b/uberwriter/sidebar.py
@@ -58,7 +58,7 @@ class Sidebar():
     Presentational class for shelves and files managed by the "sidebar"
 
     parentwindow:
-        Reference to UberwriterWindow
+        Reference to Window
     """
     def __init__(self, parentwindow):
         """
diff --git a/uberwriter/window.py b/uberwriter/window.py
index a42c24c..5575cb7 100644
--- a/uberwriter/window.py
+++ b/uberwriter/window.py
@@ -76,7 +76,7 @@ class Window(Gtk.ApplicationWindow):
                                        title="Uberwriter")
 
         # Set UI
-        self.builder = get_builder('UberwriterWindow')
+        self.builder = get_builder('Window')
         root = self.builder.get_object("FullscreenOverlay")
         root.connect('style-updated', self.apply_current_theme)
         self.add(root)
@@ -742,7 +742,7 @@ class Window(Gtk.ApplicationWindow):
         return False
 
     def on_mnu_close_activate(self, _widget, _data=None):
-        """Signal handler for closing the UberwriterWindow.
+        """Signal handler for closing the Window.
            Overriden from parent Window Class
         """
         if self.on_delete_called(self):  # Really destroy?