4 files changed, 6 insertions, 9 deletions
diff --git a/grc/gui/ActionHandler.py b/grc/gui/Application.py
index 7898146dcc..c68b38bbaf 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/Application.py
@@ -33,7 +33,7 @@ from .PropsDialog import PropsDialog
 from ..core import ParseXML, Messages
 
 
-class ActionHandler(Gtk.Application):
+class Application(Gtk.Application):
     """
     The action handler will setup all the major window components,
     and handle button presses and flow graph operations from the GUI.
@@ -42,7 +42,7 @@ class ActionHandler(Gtk.Application):
     def __init__(self, file_paths, platform):
         Gtk.Application.__init__(self)
         """
-        ActionHandler constructor.
+        Application constructor.
         Create the main window, setup the message handler, import the preferences,
         and connect all of the action handlers. Finally, enter the gtk main loop and block.
 
diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py
index da4b11a3b6..0eb88952b7 100644
--- a/grc/gui/Dialogs.py
+++ b/grc/gui/Dialogs.py
@@ -124,7 +124,7 @@ class TextDisplay(SimpleTextDisplay):
             logfile.write(buf.get_text(buf.get_start_iter(),
                                        buf.get_end_iter(), True))
 
-    # Action functions are set by the ActionHandler's init function
+    # Action functions are set by the Application's init function
     def clear_cb(self, menu_item, web_view):
         """ Callback function to clear the text buffer """
         Actions.CLEAR_CONSOLE()
diff --git a/grc/gui/Executor.py b/grc/gui/Executor.py
index a8c67986e5..7168c9ef46 100644
--- a/grc/gui/Executor.py
+++ b/grc/gui/Executor.py
@@ -35,9 +35,6 @@ class ExecFlowGraphThread(threading.Thread):
     def __init__(self, flow_graph_page, xterm_executable, callback):
         """
         ExecFlowGraphThread constructor.
-
-        Args:
-            action_handler: an instance of an ActionHandler
         """
         threading.Thread.__init__(self)
 
diff --git a/grc/main.py b/grc/main.py
index e4d2cef234..e0f2b26d05 100755
--- a/grc/main.py
+++ b/grc/main.py
@@ -24,7 +24,7 @@ from gi.repository import Gtk
 
 from gnuradio import gr
 from .gui.Platform import Platform
-from .gui.ActionHandler import ActionHandler
+from .gui.Application import Application
 
 
 VERSION_AND_DISCLAIMER_TEMPLATE = """\
@@ -53,6 +53,6 @@ def main():
         prefs=gr.prefs(),
         install_prefix=gr.prefix()
     )
-    
-    app = ActionHandler(args.flow_graphs, platform)
+
+    app = Application(args.flow_graphs, platform)
     sys.exit(app.run())