diff --git a/simeonc-calc/src/main/java/app/App.java b/simeonc-calc/src/main/java/app/CalcApp.java
similarity index 88%
rename from simeonc-calc/src/main/java/app/App.java
rename to simeonc-calc/src/main/java/app/CalcApp.java
index b27d0955105d0cb84b7fa7ee21086953ac6391ca..cec1706c3a6a8dc4e321f3f91fcad8702a736e93 100644
--- a/simeonc-calc/src/main/java/app/App.java
+++ b/simeonc-calc/src/main/java/app/CalcApp.java
@@ -11,11 +11,11 @@ import java.io.IOException;
 /**
  * JavaFX App
  */
-public class App extends Application {
+public class CalcApp extends Application {
 
     @Override
     public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml"));
+        FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("Calc.fxml"));
         Parent parent = fxmlLoader.load();
         stage.setScene(new Scene(parent));
         stage.show();
diff --git a/simeonc-calc/src/main/java/app/AppController.java b/simeonc-calc/src/main/java/app/CalcController.java
similarity index 98%
rename from simeonc-calc/src/main/java/app/AppController.java
rename to simeonc-calc/src/main/java/app/CalcController.java
index 29e31646a58305a6b349ed8c27a4a3ed2f9c0614..1f589575a4549fb6f1dd10af97cc6056ef37f6da 100644
--- a/simeonc-calc/src/main/java/app/AppController.java
+++ b/simeonc-calc/src/main/java/app/CalcController.java
@@ -10,11 +10,11 @@ import javafx.scene.control.Label;
 import javafx.scene.control.Labeled;
 import javafx.scene.control.ListView;
 
-public class AppController {
+public class CalcController {
 
     private Calc calc;
 
-    public AppController() {
+    public CalcController() {
         calc = new Calc(0.0, 0.0, 0.0);
     }
 
diff --git a/simeonc-calc/src/main/resources/app/App.fxml b/simeonc-calc/src/main/resources/app/Calc.fxml
similarity index 97%
rename from simeonc-calc/src/main/resources/app/App.fxml
rename to simeonc-calc/src/main/resources/app/Calc.fxml
index e46a0565157afa9716cfcd944cd0ae68619f7ffb..42b3b8288b33290cc97b52630421b761a235223c 100644
--- a/simeonc-calc/src/main/resources/app/App.fxml
+++ b/simeonc-calc/src/main/resources/app/Calc.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ListView?>
 
-<GridPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.AppController"
+<GridPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.CalcController"
          alignment="CENTER" hgap="10.0" vgap="10.0" >
 
    <ListView fx:id="operandsView" prefHeight="80.0"
diff --git a/simeonc-calc/src/test/java/app/AppTest.java b/simeonc-calc/src/test/java/app/AppTest.java
index 209ebfc63ace75f7894281ca73ec606f61da4798..73f81004dad8327a31ec23d861aeea9777ec39fb 100644
--- a/simeonc-calc/src/test/java/app/AppTest.java
+++ b/simeonc-calc/src/test/java/app/AppTest.java
@@ -24,12 +24,12 @@ import org.testfx.matcher.control.LabeledMatchers;
  */
 public class AppTest extends ApplicationTest {
 
-    private AppController controller;
+    private CalcController controller;
     private Parent root;
 
     @Override
     public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml"));
+        FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("Calc.fxml"));
         root = fxmlLoader.load();
         controller = fxmlLoader.getController();
         stage.setScene(new Scene(root));