diff --git a/eco-api/src/main/kotlin/com/willfp/eco/util/NamespacedKeyUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/NamespacedKeyUtils.kt
index 91d05174..c8ec5e69 100644
--- a/eco-api/src/main/kotlin/com/willfp/eco/util/NamespacedKeyUtils.kt
+++ b/eco-api/src/main/kotlin/com/willfp/eco/util/NamespacedKeyUtils.kt
@@ -18,4 +18,4 @@ fun namespacedKeyOf(namespace: String, key: String) =
 
 /** @see EcoPlugin.namespacedKeyFactory */
 fun namespacedKeyOf(plugin: EcoPlugin, key: String) =
-    plugin.namespacedKeyFactory.create(key)
+    plugin.createNamespacedKey(key)
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/display/EcoDisplayHandler.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/display/EcoDisplayHandler.kt
index 199869fe..d7c8b94c 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/display/EcoDisplayHandler.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/display/EcoDisplayHandler.kt
@@ -13,7 +13,7 @@ import org.bukkit.persistence.PersistentDataType
 
 class EcoDisplayHandler(plugin: EcoPlugin) : DisplayHandler {
     private val registeredModules = sortedMapOf<Int, MutableList<DisplayModule>>()
-    private val finalizeKey: NamespacedKey = plugin.namespacedKeyFactory.create("finalized")
+    private val finalizeKey: NamespacedKey = plugin.createNamespacedKey("finalized")
 
     override fun registerDisplayModule(module: DisplayModule) {
         val modules = registeredModules[module.weight] ?: mutableListOf()
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt
index b5633b2c..c2cd1e9a 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/arrows/ArrowDataListener.kt
@@ -37,6 +37,6 @@ class ArrowDataListener(
             return
         }
 
-        arrow.setMetadata("shot-from", this.plugin.metadataValueFactory.create(item))
+        arrow.setMetadata("shot-from", this.plugin.createMetadataValue(item))
     }
-}
\ No newline at end of file
+}
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/PlayerBlockListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/PlayerBlockListener.kt
index 32714436..ba6265e6 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/PlayerBlockListener.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/data/PlayerBlockListener.kt
@@ -103,7 +103,7 @@ class PlayerBlockListener(
     private fun writeKey(location: Location) {
         val loc = location.hashCode().toString(16)
         location.chunk.persistentDataContainer.set(
-            plugin.namespacedKeyFactory.create(loc.lowercase()),
+            plugin.createNamespacedKey(loc.lowercase()),
             PersistentDataType.INTEGER,
             1
         )
@@ -115,6 +115,6 @@ class PlayerBlockListener(
 
     private fun removeKey(location: Location) {
         val loc = location.hashCode().toString(16)
-        location.chunk.persistentDataContainer.remove(plugin.namespacedKeyFactory.create(loc.lowercase()))
+        location.chunk.persistentDataContainer.remove(plugin.createNamespacedKey(loc.lowercase()))
     }
 }
\ No newline at end of file
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/player/PlayerHealthFixer.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/player/PlayerHealthFixer.kt
index 181d231d..f78569e1 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/player/PlayerHealthFixer.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/player/PlayerHealthFixer.kt
@@ -13,7 +13,7 @@ class PlayerHealthFixer(
     private val plugin: EcoPlugin
 ): Listener {
     private val lastHealthKey = PersistentDataKey(
-        plugin.namespacedKeyFactory.create("last_health"),
+        plugin.createNamespacedKey("last_health"),
         PersistentDataKeyType.DOUBLE,
         0.0
     )