diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json
index 0b501b578..f123a10aa 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json
@@ -2,8 +2,8 @@
   "parent": "appliedenergistics2:item/display_base",
   "textures": {
     "front": "appliedenergistics2:parts/crafting_terminal",
-    "front_bright": "appliedenergistics2:parts/fluid_terminal/lights_bright",
-    "front_medium": "appliedenergistics2:parts/fluid_terminal/lights_medium",
-    "front_dark": "appliedenergistics2:parts/fluid_terminal/lights_dark"
+    "front_bright": "appliedenergistics2:parts/fluid_terminal_bright",
+    "front_medium": "appliedenergistics2:parts/fluid_terminal_medium",
+    "front_dark": "appliedenergistics2:parts/fluid_terminal_dark"
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json
deleted file mode 100644
index ce80ad08e..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "textures": {
-    "frame": "appliedenergistics2:parts/crafting_terminal/frame",
-    "sides": "appliedenergistics2:parts/crafting_terminal/sides",
-    "back": "appliedenergistics2:parts/crafting_terminal/back",
-    "l0": "appliedenergistics2:parts/crafting_terminal/l0",
-    "l1": "appliedenergistics2:parts/crafting_terminal/l1",
-    "l2": "appliedenergistics2:parts/crafting_terminal/l2",
-    "SidesStatus": "appliedenergistics2:parts/crafting_terminal/sidesstatus",
-    "Backlights": "appliedenergistics2:parts/crafting_terminal/backlights",
-    "particle": "appliedenergistics2:parts/crafting_terminal/back"
-  },
-  "elements": [
-    {
-      "name": "Base",
-      "from": [2.0, 2.0, 0.0],
-      "to": [14.0, 14.0, 1.0],
-      "faces": {
-        "north": {
-          "texture": "frame",
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        },
-        "east": {
-          "texture": "sides",
-          "uv": [0.0, 2.0, 1.0, 14.0]
-        },
-        "south": {
-          "texture": "back",
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        },
-        "west": {
-          "texture": "sides",
-          "uv": [15.0, 2.0, 16.0, 14.0]
-        },
-        "up": {
-          "texture": "sides",
-          "uv": [2.0, 0.0, 14.0, 1.0]
-        },
-        "down": {
-          "texture": "sides",
-          "uv": [2.0, 15.0, 14.0, 16.0]
-        }
-      }
-    },
-    {
-      "name": "l0",
-      "from": [2.0, 2.0, 0.0],
-      "to": [14.0, 14.0, 1.0],
-      "faces": {
-        "north": {
-          "texture": "l0",
-          "tintindex": 1,
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        }
-      }
-    },
-    {
-      "name": "l1",
-      "from": [2.0, 2.0, 0.0],
-      "to": [14.0, 14.0, 1.0],
-      "faces": {
-        "north": {
-          "texture": "l1",
-          "tintindex": 2,
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        }
-      }
-    },
-    {
-      "name": "l2",
-      "from": [2.0, 2.0, 0.0],
-      "to": [14.0, 14.0, 1.0],
-      "faces": {
-        "north": {
-          "texture": "l2",
-          "tintindex": 3,
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        }
-      }
-    },
-    {
-      "name": "Back",
-      "from": [4.0, 4.0, 1.0],
-      "to": [12.0, 12.0, 2.0],
-      "faces": {
-        "north": {
-          "texture": "back",
-          "uv": [4.0, 4.0, 12.0, 12.0]
-        },
-        "east": {
-          "texture": "SidesStatus",
-          "uv": [0.0, 4.0, 1.0, 12.0]
-        },
-        "south": {
-          "texture": "back",
-          "uv": [4.0, 4.0, 12.0, 12.0]
-        },
-        "west": {
-          "texture": "SidesStatus",
-          "uv": [15.0, 4.0, 16.0, 12.0]
-        },
-        "up": {
-          "texture": "SidesStatus",
-          "uv": [4.0, 0.0, 12.0, 1.0]
-        },
-        "down": {
-          "texture": "SidesStatus",
-          "uv": [4.0, 15.0, 12.0, 16.0]
-        }
-      }
-    },
-    {
-      "name": "Backlights",
-      "from": [4.0, 4.0, 1.0],
-      "to": [12.0, 12.0, 2.0],
-      "faces": {
-        "east": {
-          "texture": "Backlights",
-          "tintindex": 0,
-          "uv": [0.0, 4.0, 1.0, 12.0]
-        },
-        "west": {
-          "texture": "Backlights",
-          "tintindex": 0,
-          "uv": [15.0, 4.0, 16.0, 12.0]
-        },
-        "up": {
-          "texture": "Backlights",
-          "tintindex": 0,
-          "uv": [4.0, 0.0, 12.0, 1.0]
-        },
-        "down": {
-          "texture": "Backlights",
-          "tintindex": 0,
-          "uv": [4.0, 15.0, 12.0, 16.0]
-        }
-      }
-    }
-  ]
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json
deleted file mode 100644
index 4f7e4a926..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json
+++ /dev/null
@@ -1,140 +0,0 @@
-{
-  "textures": {
-    "frame": "appliedenergistics2:parts/fluid_terminal/frame",
-    "sides": "appliedenergistics2:parts/fluid_terminal/sides",
-    "back": "appliedenergistics2:parts/fluid_terminal/back",
-    "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright",
-    "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium",
-    "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_dark",
-    "status": "appliedenergistics2:parts/fluid_terminal/status",
-    "backlights": "appliedenergistics2:parts/fluid_terminal/backlights",
-    "particle": "appliedenergistics2:parts/fluid_terminal/back"
-  },
-  "elements": [
-    {
-      "name": "Base",
-      "from": [2.0, 2.0, 0.0],
-      "to": [14.0, 14.0, 1.0],
-      "faces": {
-        "north": {
-          "texture": "frame",
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        },
-        "east": {
-          "texture": "sides",
-          "uv": [0.0, 2.0, 1.0, 14.0]
-        },
-        "south": {
-          "texture": "back",
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        },
-        "west": {
-          "texture": "sides",
-          "uv": [15.0, 2.0, 16.0, 14.0]
-        },
-        "up": {
-          "texture": "sides",
-          "uv": [2.0, 0.0, 14.0, 1.0]
-        },
-        "down": {
-          "texture": "sides",
-          "uv": [2.0, 15.0, 14.0, 16.0]
-        }
-      }
-    },
-    {
-      "name": "lightsBright",
-      "from": [2.0, 2.0, 0.0],
-      "to": [14.0, 14.0, 1.0],
-      "faces": {
-        "north": {
-          "texture": "lightsBright",
-          "tintindex": 1,
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        }
-      }
-    },
-    {
-      "name": "lightsDark",
-      "from": [2.0, 2.0, 0.0],
-      "to": [14.0, 14.0, 1.0],
-      "faces": {
-        "north": {
-          "texture": "lightsDark",
-          "tintindex": 2,
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        }
-      }
-    },
-    {
-      "name": "lightsMedium",
-      "from": [2.0, 2.0, 0.0],
-      "to": [14.0, 14.0, 1.0],
-      "faces": {
-        "north": {
-          "texture": "lightsMedium",
-          "tintindex": 3,
-          "uv": [2.0, 2.0, 14.0, 14.0]
-        }
-      }
-    },
-    {
-      "name": "Back",
-      "from": [4.0, 4.0, 1.0],
-      "to": [12.0, 12.0, 2.0],
-      "faces": {
-        "north": {
-          "texture": "back",
-          "uv": [4.0, 4.0, 12.0, 12.0]
-        },
-        "east": {
-          "texture": "status",
-          "uv": [0.0, 4.0, 1.0, 12.0]
-        },
-        "south": {
-          "texture": "back",
-          "uv": [4.0, 4.0, 12.0, 12.0]
-        },
-        "west": {
-          "texture": "status",
-          "uv": [15.0, 4.0, 16.0, 12.0]
-        },
-        "up": {
-          "texture": "status",
-          "uv": [4.0, 0.0, 12.0, 1.0]
-        },
-        "down": {
-          "texture": "status",
-          "uv": [4.0, 15.0, 12.0, 16.0]
-        }
-      }
-    },
-    {
-      "name": "backlights",
-      "from": [4.0, 4.0, 1.0],
-      "to": [12.0, 12.0, 2.0],
-      "faces": {
-        "east": {
-          "texture": "backlights",
-          "tintindex": 0,
-          "uv": [0.0, 4.0, 1.0, 12.0]
-        },
-        "west": {
-          "texture": "backlights",
-          "tintindex": 0,
-          "uv": [15.0, 4.0, 16.0, 12.0]
-        },
-        "up": {
-          "texture": "backlights",
-          "tintindex": 0,
-          "uv": [4.0, 0.0, 12.0, 1.0]
-        },
-        "down": {
-          "texture": "backlights",
-          "tintindex": 0,
-          "uv": [4.0, 15.0, 12.0, 16.0]
-        }
-      }
-    }
-  ]
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json
index 533eb164f..90fed86b0 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json
@@ -1,8 +1,8 @@
 {
   "parent": "appliedenergistics2:part/display_off",
   "textures": {
-    "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright",
-    "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium",
-    "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_dark"
+    "lightsBright": "appliedenergistics2:parts/fluid_terminal_bright",
+    "lightsMedium": "appliedenergistics2:parts/fluid_terminal_medium",
+    "lightsDark": "appliedenergistics2:parts/fluid_terminal_dark"
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json
index e0f80b175..4b3fcf81c 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json
@@ -1,9 +1,9 @@
 {
   "loader": "appliedenergistics2:uvlightmap",
   "textures": {
-    "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright",
-    "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium",
-    "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_dark"
+    "lightsBright": "appliedenergistics2:parts/fluid_terminal_bright",
+    "lightsMedium": "appliedenergistics2:parts/fluid_terminal_medium",
+    "lightsDark": "appliedenergistics2:parts/fluid_terminal_dark"
   },
   "elements": [
     {
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png
deleted file mode 100644
index f225dcf4b..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png
deleted file mode 100644
index b9ac51647..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png
deleted file mode 100644
index 5c35091fc..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png
deleted file mode 100644
index aea323854..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png
deleted file mode 100644
index c48de0892..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png
deleted file mode 100644
index bf283814e..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png
deleted file mode 100644
index 8b1f6f9f3..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png
deleted file mode 100644
index 142f38511..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png
deleted file mode 100644
index f225dcf4b..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png
deleted file mode 100644
index b9ac51647..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png
deleted file mode 100644
index 5c35091fc..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png
deleted file mode 100644
index 8b1f6f9f3..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png
deleted file mode 100644
index 142f38511..000000000
Binary files a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png and /dev/null differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_bright.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png
rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_bright.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_dark.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png
rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_dark.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_medium.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png
rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_medium.png