diff --git a/src/main/java/org/springframework/hateoas/client/Traverson.java b/src/main/java/org/springframework/hateoas/client/Traverson.java
index e42db23f..3ad4f695 100644
--- a/src/main/java/org/springframework/hateoas/client/Traverson.java
+++ b/src/main/java/org/springframework/hateoas/client/Traverson.java
@@ -74,7 +74,7 @@ public class Traverson {
 
 	static {
 		LinkDiscoverer discoverer = new HalLinkDiscoverer();
-		DEFAULT_LINK_DISCOVERERS = new LinkDiscoverers(OrderAwarePluginRegistry.create(Arrays.asList(discoverer)));
+		DEFAULT_LINK_DISCOVERERS = new LinkDiscoverers(OrderAwarePluginRegistry.of(Arrays.asList(discoverer)));
 	}
 
 	private final URI baseUri;
@@ -208,7 +208,7 @@ public class Traverson {
 	public Traverson setLinkDiscoverers(List<? extends LinkDiscoverer> discoverer) {
 
 		this.discoverers = this.discoverers == null ? DEFAULT_LINK_DISCOVERERS
-				: new LinkDiscoverers(OrderAwarePluginRegistry.create(discoverer));
+				: new LinkDiscoverers(OrderAwarePluginRegistry.of(discoverer));
 
 		return this;
 	}
diff --git a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
index 2c0377dd..8932d2ac 100755
--- a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
+++ b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java
@@ -79,7 +79,7 @@ public class ControllerLinkBuilder extends LinkBuilderSupport<ControllerLinkBuil
 				ControllerLinkBuilder.class.getClassLoader());
 
 		PluginRegistry<? extends AffordanceModelFactory, MediaType> MODEL_FACTORIES = OrderAwarePluginRegistry
-				.create(factories);
+				.of(factories);
 	}
 
 	private final TemplateVariables variables;
diff --git a/src/test/java/org/springframework/hateoas/LinkDiscoverersUnitTest.java b/src/test/java/org/springframework/hateoas/LinkDiscoverersUnitTest.java
index 05057e4b..2e7e1ea4 100755
--- a/src/test/java/org/springframework/hateoas/LinkDiscoverersUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/LinkDiscoverersUnitTest.java
@@ -45,7 +45,7 @@ public class LinkDiscoverersUnitTest {
 		LinkDiscoverer low = new LowPriorityLinkDiscoverer();
 		LinkDiscoverer high = new HighPriorityLinkDiscoverer();
 
-		PluginRegistry<LinkDiscoverer, MediaType> registry = OrderAwarePluginRegistry.create(Arrays.asList(low, high));
+		PluginRegistry<LinkDiscoverer, MediaType> registry = OrderAwarePluginRegistry.of(Arrays.asList(low, high));
 		assertThat(registry.getRequiredPluginFor(MediaType.APPLICATION_JSON)).isEqualTo(high);
 	}
 
diff --git a/src/test/java/org/springframework/hateoas/mvc/SpringMvcAffordanceBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/SpringMvcAffordanceBuilderUnitTest.java
index 771e9d5c..1d3a6e56 100644
--- a/src/test/java/org/springframework/hateoas/mvc/SpringMvcAffordanceBuilderUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/mvc/SpringMvcAffordanceBuilderUnitTest.java
@@ -45,7 +45,7 @@ public class SpringMvcAffordanceBuilderUnitTest {
 		AffordanceModelFactory high = new HighPriorityModelFactory();
 
 		PluginRegistry<AffordanceModelFactory, MediaType> registry = OrderAwarePluginRegistry
-				.create(Arrays.asList(low, high));
+				.of(Arrays.asList(low, high));
 
 		assertThat(registry.getPluginFor(MediaType.APPLICATION_JSON).get()).isEqualTo(high);
 	}