diff --git a/SpongeAPI b/SpongeAPI
index bf2e160c583..82e2e7454de 160000
--- a/SpongeAPI
+++ b/SpongeAPI
@@ -1 +1 @@
-Subproject commit bf2e160c5834c7074f2e40ba61cbd6f0a4d1a6a5
+Subproject commit 82e2e7454ded6b488dac70a2eb7bf453de356794
diff --git a/testplugins/src/main/java/org/spongepowered/test/customdata/CustomDataTest.java b/testplugins/src/main/java/org/spongepowered/test/customdata/CustomDataTest.java
index 8398a41709b..4b3d47681c9 100644
--- a/testplugins/src/main/java/org/spongepowered/test/customdata/CustomDataTest.java
+++ b/testplugins/src/main/java/org/spongepowered/test/customdata/CustomDataTest.java
@@ -175,10 +175,10 @@ public void onRegisterData(final RegisterDataEvent event) {
 
         // Or if it is super simple data
 
-        this.mySimpleDataKey = Key.valued(this.plugin, "mysimpledata", String.class);
+        this.mySimpleDataKey = Key.forElement(this.plugin, "mysimpledata", String.class);
         event.register(DataRegistration.of(this.mySimpleDataKey, ItemStack.class));
 
-        this.myItemTypeKey = Key.valued(this.plugin, "myitemtypedata", ItemType.class);
+        this.myItemTypeKey = Key.forElement(this.plugin, "myitemtypedata", ItemType.class);
         event.register(DataRegistration.of(this.myItemTypeKey, ItemStack.class));
     }