diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/interface.json b/src/main/resources/assets/appliedenergistics2/blockstates/interface.json
new file mode 100644
index 00000000..025d55de
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/interface.json
@@ -0,0 +1,6 @@
+{
+  "variants": {
+    "omnidirectional=true": { "model": "appliedenergistics2:interface" },
+    "omnidirectional=false": { "model": "appliedenergistics2:interface_oriented", "x": 90 }
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInterface.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInterface.json
deleted file mode 100644
index f2fa4a97..00000000
--- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockInterface.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "variants": {
-    "omnidirectional=true": { "model": "appliedenergistics2:tile.BlockInterface" },
-    "omnidirectional=false": { "model": "appliedenergistics2:tile.BlockInterfaceOriented", "x": 90 }
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/interface.json b/src/main/resources/assets/appliedenergistics2/models/block/interface.json
new file mode 100644
index 00000000..913d1c4a
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/interface.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:blocks/interface"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/interface_oriented.json b/src/main/resources/assets/appliedenergistics2/models/block/interface_oriented.json
new file mode 100644
index 00000000..e83ef26d
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/interface_oriented.json
@@ -0,0 +1,12 @@
+{
+  "parent": "block/cube",
+  "textures": {
+    "particle": "appliedenergistics2:blocks/interface",
+    "down": "appliedenergistics2:blocks/interface_alternate",
+    "up": "appliedenergistics2:blocks/interface",
+    "north": "appliedenergistics2:blocks/interface_alternate_arrow",
+    "south": "appliedenergistics2:blocks/interface_alternate_arrow",
+    "east": "appliedenergistics2:blocks/interface_alternate_arrow",
+    "west": "appliedenergistics2:blocks/interface_alternate_arrow"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInterface.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInterface.json
deleted file mode 100644
index 26742fcd..00000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInterface.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:blocks/BlockInterface"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInterfaceOriented.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInterfaceOriented.json
deleted file mode 100644
index 9973a1aa..00000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockInterfaceOriented.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "parent": "block/cube",
-  "textures": {
-    "particle": "appliedenergistics2:blocks/BlockInterface",
-    "down": "appliedenergistics2:blocks/BlockInterfaceAlternate",
-    "up": "appliedenergistics2:blocks/BlockInterface",
-    "north": "appliedenergistics2:blocks/BlockInterfaceAlternateArrow",
-    "south": "appliedenergistics2:blocks/BlockInterfaceAlternateArrow",
-    "east": "appliedenergistics2:blocks/BlockInterfaceAlternateArrow",
-    "west": "appliedenergistics2:blocks/BlockInterfaceAlternateArrow"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInterface.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInterface.json
deleted file mode 100644
index 6a45ddc3..00000000
--- a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockInterface.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "appliedenergistics2:block/tile.BlockInterface"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInterface.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/interface.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInterface.png
rename to src/main/resources/assets/appliedenergistics2/textures/blocks/interface.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInterfaceAlternate.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/interface_alternate.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInterfaceAlternate.png
rename to src/main/resources/assets/appliedenergistics2/textures/blocks/interface_alternate.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInterfaceAlternateArrow.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/interface_alternate_arrow.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/blocks/BlockInterfaceAlternateArrow.png
rename to src/main/resources/assets/appliedenergistics2/textures/blocks/interface_alternate_arrow.png