diff --git a/build.properties b/build.properties
index 99b36f4ea..035744667 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.1.1217
 
-oc.version=1.4.0
+oc.version=2.0.0
 oc.subversion=dev
 
 ae2.version=+
diff --git a/src/main/scala/li/cil/oc/common/template/RobotTemplate.scala b/src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
index e872dfba4..1ae914100 100644
--- a/src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
+++ b/src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
@@ -49,7 +49,7 @@ object RobotTemplate extends Template {
       nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier1")
       nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate")
       nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble")
-      nbt.setString("hostClass", "li.cil.oc.api.tileentity.Robot")
+      nbt.setString("hostClass", "li.cil.oc.api.internal.Robot")
 
       val containerSlots = new NBTTagList()
       containerSlots.appendTag(Map("tier" -> Tier.Two))
@@ -83,7 +83,7 @@ object RobotTemplate extends Template {
       nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier2")
       nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate")
       nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble")
-      nbt.setString("hostClass", "li.cil.oc.api.tileentity.Robot")
+      nbt.setString("hostClass", "li.cil.oc.api.internal.Robot")
 
       val containerSlots = new NBTTagList()
       containerSlots.appendTag(Map("tier" -> Tier.Three))
@@ -120,7 +120,7 @@ object RobotTemplate extends Template {
       nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier3")
       nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate")
       nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble")
-      nbt.setString("hostClass", "li.cil.oc.api.tileentity.Robot")
+      nbt.setString("hostClass", "li.cil.oc.api.internal.Robot")
 
       val containerSlots = new NBTTagList()
       containerSlots.appendTag(Map("tier" -> Tier.Three))
@@ -161,7 +161,7 @@ object RobotTemplate extends Template {
       nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectCreative")
       nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate")
       nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble")
-      nbt.setString("hostClass", "li.cil.oc.api.tileentity.Robot")
+      nbt.setString("hostClass", "li.cil.oc.api.internal.Robot")
 
       val containerSlots = new NBTTagList()
       containerSlots.appendTag(Map("tier" -> Tier.Three))
diff --git a/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala b/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
index 166580e40..02b233521 100644
--- a/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
+++ b/src/main/scala/li/cil/oc/common/template/TabletTemplate.scala
@@ -46,7 +46,7 @@ object TabletTemplate extends Template {
     nbt.setString("select", "li.cil.oc.common.template.TabletTemplate.select")
     nbt.setString("validate", "li.cil.oc.common.template.TabletTemplate.validate")
     nbt.setString("assemble", "li.cil.oc.common.template.TabletTemplate.assemble")
-    nbt.setString("hostClass", "li.cil.oc.common.item.TabletWrapper")
+    nbt.setString("hostClass", "li.cil.oc.api.internal.Tablet")
 
     val upgradeSlots = new NBTTagList()
     upgradeSlots.appendTag(Map("tier" -> Tier.Three))