diff --git a/ProjectAirFighter/src/main/java/com/projectairfighter/FormAirFighter.java b/ProjectAirFighter/src/main/java/com/projectairfighter/FormAirFighter.java
index 13c5d18..ddb68cd 100644
--- a/ProjectAirFighter/src/main/java/com/projectairfighter/FormAirFighter.java
+++ b/ProjectAirFighter/src/main/java/com/projectairfighter/FormAirFighter.java
@@ -51,7 +51,7 @@ public class FormAirFighter extends Application {
             }
             if (strategy == null)
                 return;
-            strategy.setData(new MoveableFighter(drawningWarPlane), (int) canvasAirFighter.getWidth(), (int) canvasAirFighter.getHeight());
+            strategy.setData(new MoveablePlane(drawningWarPlane), (int) canvasAirFighter.getWidth(), (int) canvasAirFighter.getHeight());
         }
         if (strategy == null)
             return;
@@ -132,9 +132,10 @@ public class FormAirFighter extends Application {
 
     @FXML
     @Override
+    @SuppressWarnings("unchecked")
     public void start(Stage primaryStage) throws IOException {
         FXMLLoader loader = new FXMLLoader();
-        loader.setLocation(FormAirFighter.class.getResource("Form.fxml"));
+        loader.setLocation(FormAirFighter.class.getResource("FormAirFighter.fxml"));
         Parent root = loader.load();
         canvasAirFighter = (Canvas) loader.getNamespace().get("canvasAirFighter");
         comboBoxStrategy = (ComboBox<String>) loader.getNamespace().get("comboBoxStrategy");
diff --git a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/DrawningAirFighter.java b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/DrawningAirFighter.java
index a9277d2..8b9a86a 100644
--- a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/DrawningAirFighter.java
+++ b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/DrawningAirFighter.java
@@ -7,13 +7,13 @@ import javafx.scene.paint.Color;
 import java.util.Random;
 
 public class DrawningAirFighter extends DrawningWarPlane {
-    private final DrawableExtras engineDrawing;
+    private final IDrawableExtras engineDrawing;
 
     public DrawningAirFighter(int speed, double weight, Color bodyColor, Color
             additionalColor, boolean bodyRockets, boolean additionalWings) {
         super(speed, weight, bodyColor);
         entityWarPlane = new EntityAirFighter(speed, weight, bodyColor, additionalColor, bodyRockets, additionalWings);
-        DrawableExtras[] engineDrawings = {
+        IDrawableExtras[] engineDrawings = {
                 new EllipticalEngineDrawing(),
                 new TriangleEngineDrawing(),
                 new RectangleEngineDrawing()
diff --git a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/EllipticalEngineDrawing.java b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/EllipticalEngineDrawing.java
index 276d863..65e9ab4 100644
--- a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/EllipticalEngineDrawing.java
+++ b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/EllipticalEngineDrawing.java
@@ -3,7 +3,7 @@ package com.projectairfighter.drawnings;
 import com.projectairfighter.entities.EntityAirFighter;
 import javafx.scene.canvas.GraphicsContext;
 
-public class EllipticalEngineDrawing implements DrawableExtras{
+public class EllipticalEngineDrawing implements IDrawableExtras {
     private EngineCount engineCount;
 
     @Override
diff --git a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/DrawableExtras.java b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/IDrawableExtras.java
similarity index 89%
rename from ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/DrawableExtras.java
rename to ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/IDrawableExtras.java
index e41f913..a37d717 100644
--- a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/DrawableExtras.java
+++ b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/IDrawableExtras.java
@@ -3,7 +3,7 @@ package com.projectairfighter.drawnings;
 import com.projectairfighter.entities.EntityAirFighter;
 import javafx.scene.canvas.GraphicsContext;
 
-public interface DrawableExtras {
+public interface IDrawableExtras {
     void setCountEngines(int countEngines);
     void drawEngine(GraphicsContext gc, EntityAirFighter entityAirFighter, int startPosX, int startPosY);
 }
diff --git a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/RectangleEngineDrawing.java b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/RectangleEngineDrawing.java
index 11a47b8..3441c16 100644
--- a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/RectangleEngineDrawing.java
+++ b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/RectangleEngineDrawing.java
@@ -3,7 +3,7 @@ package com.projectairfighter.drawnings;
 import com.projectairfighter.entities.EntityAirFighter;
 import javafx.scene.canvas.GraphicsContext;
 
-public class RectangleEngineDrawing implements DrawableExtras {
+public class RectangleEngineDrawing implements IDrawableExtras {
     private EngineCount engineCount;
 
     @Override
diff --git a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/TriangleEngineDrawing.java b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/TriangleEngineDrawing.java
index a47ca64..4eb0776 100644
--- a/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/TriangleEngineDrawing.java
+++ b/ProjectAirFighter/src/main/java/com/projectairfighter/drawnings/TriangleEngineDrawing.java
@@ -3,7 +3,7 @@ package com.projectairfighter.drawnings;
 import com.projectairfighter.entities.EntityAirFighter;
 import javafx.scene.canvas.GraphicsContext;
 
-public class TriangleEngineDrawing implements DrawableExtras {
+public class TriangleEngineDrawing implements IDrawableExtras {
     private EngineCount engineCount;
 
     @Override
diff --git a/ProjectAirFighter/src/main/resources/com/projectairfighter/Form.fxml b/ProjectAirFighter/src/main/resources/com/projectairfighter/FormAirFighter.fxml
similarity index 100%
rename from ProjectAirFighter/src/main/resources/com/projectairfighter/Form.fxml
rename to ProjectAirFighter/src/main/resources/com/projectairfighter/FormAirFighter.fxml