diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java
index 2bf6aa5d3..f2e04328a 100644
--- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java
+++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java
@@ -28,9 +28,10 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import prospector.shootingstar.ShootingStar;
-import prospector.shootingstar.model.ModelCompound;
+
 import reborncore.api.tile.IMachineGuiHandler;
+import reborncore.client.models.ModelCompound;
+import reborncore.client.models.RebornModelRegistry;
 import reborncore.common.blocks.BlockMachineBase;
 import techreborn.client.EGui;
 import techreborn.lib.ModInfo;
@@ -41,9 +42,9 @@ public class BlockCreativeQuantumChest extends BlockMachineBase {
 
 	public BlockCreativeQuantumChest() {
 		super();
-		this.setUnlocalizedName("techreborn.creativeQuantumChest");
+		this.setTranslationKey("techreborn.creativeQuantumChest");
 		setCreativeTab(TechRebornCreativeTab.instance);
-		ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
+		RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
 	}
 
 	@Override
diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java
index 5dcae21af..06af6d517 100644
--- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java
+++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java
@@ -26,9 +26,9 @@ package techreborn.blocks.tier3;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import prospector.shootingstar.ShootingStar;
-import prospector.shootingstar.model.ModelCompound;
 import reborncore.api.tile.IMachineGuiHandler;
+import reborncore.client.models.ModelCompound;
+import reborncore.client.models.RebornModelRegistry;
 import reborncore.common.blocks.BlockMachineBase;
 import techreborn.client.EGui;
 import techreborn.lib.ModInfo;
@@ -40,7 +40,7 @@ public class BlockCreativeQuantumTank extends BlockMachineBase {
 	public BlockCreativeQuantumTank() {
 		super();
 		setCreativeTab(TechRebornCreativeTab.instance);
-		ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
+		RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
 	}
 
 	@Override
diff --git a/src/main/java/techreborn/client/gui/GuiBase.java b/src/main/java/techreborn/client/gui/GuiBase.java
index 926b53865..d5c228359 100644
--- a/src/main/java/techreborn/client/gui/GuiBase.java
+++ b/src/main/java/techreborn/client/gui/GuiBase.java
@@ -41,7 +41,7 @@ import techreborn.client.container.builder.BuiltContainer;
 import techreborn.client.gui.slot.GuiFluidConfiguration;
 import techreborn.client.gui.slot.GuiSlotConfiguration;
 import techreborn.client.gui.widget.GuiButtonPowerBar;
-import techreborn.init.ModItems;
+import techreborn.init.TRItems;
 import techreborn.items.DynamicCell;
 
 import java.io.IOException;
@@ -144,7 +144,7 @@ public class GuiBase extends GuiContainer {
 			}
 		}
 		if(getMachine().hasSlotConfig()){
-			builder.drawSlotTab(this, guiLeft, guiTop, mouseX, mouseY, upgrades, new ItemStack(ModItems.WRENCH));
+			builder.drawSlotTab(this, guiLeft, guiTop, mouseX, mouseY, upgrades, new ItemStack(TRItems.WRENCH));
 		}
 		if(getMachine().showTankConfig()){
 			builder.drawSlotTab(this, guiLeft, guiTop + 27, mouseX, mouseY, upgrades, DynamicCell.getCellWithFluid(FluidRegistry.LAVA));
diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java
index 448713b58..5b54b7d8e 100644
--- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java
+++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java
@@ -29,7 +29,7 @@ import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import techreborn.init.ModItems;
+import techreborn.init.TRItems;
 import techreborn.tiles.tier0.TileIronFurnace;
 
 public class GuiIronFurnace extends GuiBase {
@@ -50,7 +50,7 @@ public class GuiIronFurnace extends GuiBase {
 	protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) {
 		this.drawDefaultBackground();
 		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-		builder.drawSlotTab(this, guiLeft, guiTop, p_146976_2_, p_146976_3_, upgrades, new ItemStack(ModItems.WRENCH));
+		builder.drawSlotTab(this, guiLeft, guiTop, p_146976_2_, p_146976_3_, upgrades, new ItemStack(TRItems.WRENCH));
 		this.mc.getTextureManager().bindTexture(GuiIronFurnace.texture);
 		final int k = (this.width - this.xSize) / 2;
 		final int l = (this.height - this.ySize) / 2;