diff --git a/wallettemplate/src/main/java/wallettemplate/Main.java b/wallettemplate/src/main/java/wallettemplate/Main.java
index 50a048b1..fde55e6c 100644
--- a/wallettemplate/src/main/java/wallettemplate/Main.java
+++ b/wallettemplate/src/main/java/wallettemplate/Main.java
@@ -34,7 +34,7 @@ public class Main extends Application {
 
     private StackPane uiStack;
     private Pane mainUI;
-    public Controller controller;
+    public MainController controller;
 
     @Override
     public void start(Stage mainWindow) throws Exception {
@@ -48,7 +48,7 @@ public class Main extends Application {
             // AquaFx.style();
         }
 
-        // Load the GUI. The Controller class will be automagically created and wired up.
+        // Load the GUI. The MainController class will be automagically created and wired up.
         URL location = getClass().getResource("main.fxml");
         FXMLLoader loader = new FXMLLoader(location);
         mainUI = loader.load();
diff --git a/wallettemplate/src/main/java/wallettemplate/Controller.java b/wallettemplate/src/main/java/wallettemplate/MainController.java
similarity index 97%
rename from wallettemplate/src/main/java/wallettemplate/Controller.java
rename to wallettemplate/src/main/java/wallettemplate/MainController.java
index ad371832..a261fd09 100644
--- a/wallettemplate/src/main/java/wallettemplate/Controller.java
+++ b/wallettemplate/src/main/java/wallettemplate/MainController.java
@@ -23,7 +23,7 @@ import static wallettemplate.Main.bitcoin;
  * Gets created auto-magically by FXMLLoader via reflection. The widget fields are set to the GUI controls they're named
  * after. This class handles all the updates and event handling for the main UI.
  */
-public class Controller {
+public class MainController {
     public ProgressBar syncProgress;
     public VBox syncBox;
     public HBox controlsBox;
@@ -67,7 +67,7 @@ public class Controller {
         @Override
         protected void doneDownload() {
             super.doneDownload();
-            Platform.runLater(Controller.this::readyToGoAnimation);
+            Platform.runLater(MainController.this::readyToGoAnimation);
         }
     }
 
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java b/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java
index c4728615..575540b4 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java
@@ -11,7 +11,7 @@ import javafx.scene.layout.Pane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-import wallettemplate.Controller;
+import wallettemplate.MainController;
 
 import java.io.IOException;
 import java.net.URL;
@@ -161,7 +161,7 @@ public class GuiUtils {
         if (false)
             return unchecked(() -> new URL("file:///your/path/here/src/main/wallettemplate/" + name));
         else
-            return Controller.class.getResource(name);
+            return MainController.class.getResource(name);
     }
 
     public static void checkGuiThread() {
diff --git a/wallettemplate/src/main/resources/wallettemplate/main.fxml b/wallettemplate/src/main/resources/wallettemplate/main.fxml
index a8ceb2e3..e3a5db26 100644
--- a/wallettemplate/src/main/resources/wallettemplate/main.fxml
+++ b/wallettemplate/src/main/resources/wallettemplate/main.fxml
@@ -15,7 +15,7 @@
 <?import wallettemplate.controls.*?>
 <?import wallettemplate.controls.ClickableBitcoinAddress ?>
 
-<AnchorPane styleClass="root-pane" maxHeight="Infinity" maxWidth="Infinity" minHeight="200.0" minWidth="300.0" prefHeight="400.0" prefWidth="800.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="wallettemplate.Controller">
+<AnchorPane styleClass="root-pane" maxHeight="Infinity" maxWidth="Infinity" minHeight="200.0" minWidth="300.0" prefHeight="400.0" prefWidth="800.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="wallettemplate.MainController">
   <children>
     <Label layoutX="14.0" layoutY="14.0" text="Balance">
       <font>