diff --git a/src/main/java/model/Elements/element.java b/src/main/java/model/Elements/Element.java
similarity index 89%
rename from src/main/java/model/Elements/element.java
rename to src/main/java/model/Elements/Element.java
index f6219fb7a40666545bee7e9f3ec795f1dca1e375..553ea842a6e18434a8a452c031e329078e41e161 100644
--- a/src/main/java/model/Elements/element.java
+++ b/src/main/java/model/Elements/Element.java
@@ -5,7 +5,7 @@ import util.Position;
 
 import java.util.List;
 
-public interface element {
+public interface Element {
 
 
 
diff --git a/src/main/java/model/Elements/Extinguisher/Extinguisher.java b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
index fe39516b0dd364c8964dc91f65da0d6ed2cc2071..31dca489f97ba5be73355c8b66ac184fd906c656 100644
--- a/src/main/java/model/Elements/Extinguisher/Extinguisher.java
+++ b/src/main/java/model/Elements/Extinguisher/Extinguisher.java
@@ -2,6 +2,7 @@ package model.Elements.Extinguisher;
 
 
 import model.Board.Board;
+import model.Elements.Element;
 import model.Elements.ModelElement;
 import util.Neighbour;
 import util.Position;
@@ -9,7 +10,7 @@ import util.TargetStrategy;
 
 import java.util.List;
 
-public abstract class Extinguisher implements model.Elements.element {
+public abstract class Extinguisher implements Element {
 
     protected final TargetStrategy targetStrategy = new TargetStrategy();
     protected Neighbour neighbour;
diff --git a/src/main/java/model/Elements/Fire.java b/src/main/java/model/Elements/Fire.java
index a552a629a6916ec3507607a3880854109d7163c3..1f0ae07973f81c2e9811b63383290b5d17306a78 100644
--- a/src/main/java/model/Elements/Fire.java
+++ b/src/main/java/model/Elements/Fire.java
@@ -11,7 +11,7 @@ import util.Position;
 import java.util.*;
 
 
-public class Fire implements element {
+public class Fire implements Element {
 
     private Position position;
 
diff --git a/src/main/java/model/Elements/ModelElement.java b/src/main/java/model/Elements/ModelElement.java
index d133bb10b1c2f92a2a9e4d44f9e8ba03d5db6d93..2803fa5b23794e110c3fb82421f271fe8b54897d 100644
--- a/src/main/java/model/Elements/ModelElement.java
+++ b/src/main/java/model/Elements/ModelElement.java
@@ -35,7 +35,7 @@ public enum ModelElement {
     return this.initialNumber;
   }
 
-  public element getModelElementClass(Position position){
+  public Element getModelElementClass(Position position){
     return switch (this){
       case FIRE -> new Fire(position);
       case ROAD -> new Road(position);
diff --git a/src/main/java/model/Elements/Obstacle/Obstacle.java b/src/main/java/model/Elements/Obstacle/Obstacle.java
index 5ad4b2fb5d9616806d9f484cd560f6de6cf94b5d..7ee70b32f9c331b3f5f3a96a1703f4b1f3a0c9b4 100644
--- a/src/main/java/model/Elements/Obstacle/Obstacle.java
+++ b/src/main/java/model/Elements/Obstacle/Obstacle.java
@@ -2,12 +2,13 @@ package model.Elements.Obstacle;
 
 
 import model.Board.Board;
+import model.Elements.Element;
 import model.Elements.ModelElement;
 import util.Position;
 
 import java.util.List;
 
-public abstract class Obstacle implements model.Elements.element {
+public abstract class Obstacle implements Element {
     protected ModelElement element;
     protected final Position position;
     public Obstacle(Position position){