diff --git a/core/src/main/java/io/atomix/core/barrier/DistributedCyclicBarrierType.java b/core/src/main/java/io/atomix/core/barrier/DistributedCyclicBarrierType.java
index c090200ea8..7a40ceb079 100644
--- a/core/src/main/java/io/atomix/core/barrier/DistributedCyclicBarrierType.java
+++ b/core/src/main/java/io/atomix/core/barrier/DistributedCyclicBarrierType.java
@@ -17,7 +17,7 @@
 
 import io.atomix.core.barrier.impl.CyclicBarrierResult;
 import io.atomix.core.barrier.impl.DefaultDistributedCyclicBarrierService;
-import io.atomix.core.barrier.impl.DistributedCyclicBarrierProxyBuilder;
+import io.atomix.core.barrier.impl.DefaultDistributedCyclicBarrierBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.service.PrimitiveService;
@@ -68,7 +68,7 @@ public DistributedCyclicBarrierConfig newConfig() {
 
   @Override
   public DistributedCyclicBarrierBuilder newBuilder(String name, DistributedCyclicBarrierConfig config, PrimitiveManagementService managementService) {
-    return new DistributedCyclicBarrierProxyBuilder(name, config, managementService);
+    return new DefaultDistributedCyclicBarrierBuilder(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/barrier/impl/DistributedCyclicBarrierProxyBuilder.java b/core/src/main/java/io/atomix/core/barrier/impl/DefaultDistributedCyclicBarrierBuilder.java
similarity index 87%
rename from core/src/main/java/io/atomix/core/barrier/impl/DistributedCyclicBarrierProxyBuilder.java
rename to core/src/main/java/io/atomix/core/barrier/impl/DefaultDistributedCyclicBarrierBuilder.java
index 8d94737d3e..bd118d4032 100644
--- a/core/src/main/java/io/atomix/core/barrier/impl/DistributedCyclicBarrierProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/barrier/impl/DefaultDistributedCyclicBarrierBuilder.java
@@ -28,8 +28,8 @@
 /**
  * Default distributed cyclic barrier builder implementation.
  */
-public class DistributedCyclicBarrierProxyBuilder extends DistributedCyclicBarrierBuilder {
-  public DistributedCyclicBarrierProxyBuilder(String name, DistributedCyclicBarrierConfig config, PrimitiveManagementService managementService) {
+public class DefaultDistributedCyclicBarrierBuilder extends DistributedCyclicBarrierBuilder {
+  public DefaultDistributedCyclicBarrierBuilder(String name, DistributedCyclicBarrierConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/counter/AtomicCounterType.java b/core/src/main/java/io/atomix/core/counter/AtomicCounterType.java
index f2d417aba6..fd50eafe55 100644
--- a/core/src/main/java/io/atomix/core/counter/AtomicCounterType.java
+++ b/core/src/main/java/io/atomix/core/counter/AtomicCounterType.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.counter;
 
-import io.atomix.core.counter.impl.AtomicCounterProxyBuilder;
+import io.atomix.core.counter.impl.DefaultAtomicCounterBuilder;
 import io.atomix.core.counter.impl.AtomicCounterResource;
 import io.atomix.core.counter.impl.DefaultAtomicCounterService;
 import io.atomix.primitive.PrimitiveManagementService;
@@ -64,7 +64,7 @@ public AtomicCounterConfig newConfig() {
 
   @Override
   public AtomicCounterBuilder newBuilder(String name, AtomicCounterConfig config, PrimitiveManagementService managementService) {
-    return new AtomicCounterProxyBuilder(name, config, managementService);
+    return new DefaultAtomicCounterBuilder(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/counter/impl/AtomicCounterProxyBuilder.java b/core/src/main/java/io/atomix/core/counter/impl/DefaultAtomicCounterBuilder.java
similarity index 88%
rename from core/src/main/java/io/atomix/core/counter/impl/AtomicCounterProxyBuilder.java
rename to core/src/main/java/io/atomix/core/counter/impl/DefaultAtomicCounterBuilder.java
index e072165bc2..16b1f8a183 100644
--- a/core/src/main/java/io/atomix/core/counter/impl/AtomicCounterProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/counter/impl/DefaultAtomicCounterBuilder.java
@@ -27,8 +27,8 @@
 /**
  * Atomic counter proxy builder.
  */
-public class AtomicCounterProxyBuilder extends AtomicCounterBuilder {
-  public AtomicCounterProxyBuilder(String name, AtomicCounterConfig config, PrimitiveManagementService managementService) {
+public class DefaultAtomicCounterBuilder extends AtomicCounterBuilder {
+  public DefaultAtomicCounterBuilder(String name, AtomicCounterConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/countermap/AtomicCounterMapType.java b/core/src/main/java/io/atomix/core/countermap/AtomicCounterMapType.java
index b6f02918aa..90f6193aca 100644
--- a/core/src/main/java/io/atomix/core/countermap/AtomicCounterMapType.java
+++ b/core/src/main/java/io/atomix/core/countermap/AtomicCounterMapType.java
@@ -16,7 +16,7 @@
 package io.atomix.core.countermap;
 
 import io.atomix.core.counter.AtomicCounterMap;
-import io.atomix.core.countermap.impl.AtomicCounterMapProxyBuilder;
+import io.atomix.core.countermap.impl.DefaultAtomicCounterMapBuilder;
 import io.atomix.core.countermap.impl.DefaultAtomicCounterMapService;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
@@ -60,7 +60,7 @@ public AtomicCounterMapConfig newConfig() {
 
   @Override
   public AtomicCounterMapBuilder<K> newBuilder(String name, AtomicCounterMapConfig config, PrimitiveManagementService managementService) {
-    return new AtomicCounterMapProxyBuilder<>(name, config, managementService);
+    return new DefaultAtomicCounterMapBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/countermap/impl/AtomicCounterMapProxyBuilder.java b/core/src/main/java/io/atomix/core/countermap/impl/DefaultAtomicCounterMapBuilder.java
similarity index 90%
rename from core/src/main/java/io/atomix/core/countermap/impl/AtomicCounterMapProxyBuilder.java
rename to core/src/main/java/io/atomix/core/countermap/impl/DefaultAtomicCounterMapBuilder.java
index d8d7a86151..ea5aa18361 100644
--- a/core/src/main/java/io/atomix/core/countermap/impl/AtomicCounterMapProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/countermap/impl/DefaultAtomicCounterMapBuilder.java
@@ -29,8 +29,8 @@
 /**
  * Default {@code AtomicCounterMapBuilder}.
  */
-public class AtomicCounterMapProxyBuilder<K> extends AtomicCounterMapBuilder<K> {
-  public AtomicCounterMapProxyBuilder(String name, AtomicCounterMapConfig config, PrimitiveManagementService managementService) {
+public class DefaultAtomicCounterMapBuilder<K> extends AtomicCounterMapBuilder<K> {
+  public DefaultAtomicCounterMapBuilder(String name, AtomicCounterMapConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/leadership/LeaderElectionType.java b/core/src/main/java/io/atomix/core/leadership/LeaderElectionType.java
index 0b48c49d6b..feaa86e780 100644
--- a/core/src/main/java/io/atomix/core/leadership/LeaderElectionType.java
+++ b/core/src/main/java/io/atomix/core/leadership/LeaderElectionType.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.leadership;
 
-import io.atomix.core.leadership.impl.LeaderElectionProxyBuilder;
+import io.atomix.core.leadership.impl.DefaultLeaderElectionBuilder;
 import io.atomix.core.leadership.impl.DefaultLeaderElectionService;
 import io.atomix.core.leadership.impl.LeaderElectionResource;
 import io.atomix.primitive.PrimitiveManagementService;
@@ -77,7 +77,7 @@ public LeaderElectionConfig newConfig() {
 
   @Override
   public LeaderElectionBuilder<T> newBuilder(String name, LeaderElectionConfig config, PrimitiveManagementService managementService) {
-    return new LeaderElectionProxyBuilder<>(name, config, managementService);
+    return new DefaultLeaderElectionBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/leadership/LeaderElectorType.java b/core/src/main/java/io/atomix/core/leadership/LeaderElectorType.java
index 0b73bf14fd..45f2696697 100644
--- a/core/src/main/java/io/atomix/core/leadership/LeaderElectorType.java
+++ b/core/src/main/java/io/atomix/core/leadership/LeaderElectorType.java
@@ -16,7 +16,7 @@
 package io.atomix.core.leadership;
 
 import io.atomix.core.leadership.impl.DefaultLeaderElectorService;
-import io.atomix.core.leadership.impl.LeaderElectorProxyBuilder;
+import io.atomix.core.leadership.impl.DefaultLeaderElectorBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.service.PrimitiveService;
@@ -69,7 +69,7 @@ public LeaderElectorConfig newConfig() {
 
   @Override
   public LeaderElectorBuilder<T> newBuilder(String name, LeaderElectorConfig config, PrimitiveManagementService managementService) {
-    return new LeaderElectorProxyBuilder<>(name, config, managementService);
+    return new DefaultLeaderElectorBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/leadership/impl/LeaderElectionProxyBuilder.java b/core/src/main/java/io/atomix/core/leadership/impl/DefaultLeaderElectionBuilder.java
similarity index 90%
rename from core/src/main/java/io/atomix/core/leadership/impl/LeaderElectionProxyBuilder.java
rename to core/src/main/java/io/atomix/core/leadership/impl/DefaultLeaderElectionBuilder.java
index 5b58edac26..395b8667f4 100644
--- a/core/src/main/java/io/atomix/core/leadership/impl/LeaderElectionProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/leadership/impl/DefaultLeaderElectionBuilder.java
@@ -28,8 +28,8 @@
 /**
  * Default implementation of {@code LeaderElectorBuilder}.
  */
-public class LeaderElectionProxyBuilder<T> extends LeaderElectionBuilder<T> {
-  public LeaderElectionProxyBuilder(String name, LeaderElectionConfig config, PrimitiveManagementService managementService) {
+public class DefaultLeaderElectionBuilder<T> extends LeaderElectionBuilder<T> {
+  public DefaultLeaderElectionBuilder(String name, LeaderElectionConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/leadership/impl/LeaderElectorProxyBuilder.java b/core/src/main/java/io/atomix/core/leadership/impl/DefaultLeaderElectorBuilder.java
similarity index 90%
rename from core/src/main/java/io/atomix/core/leadership/impl/LeaderElectorProxyBuilder.java
rename to core/src/main/java/io/atomix/core/leadership/impl/DefaultLeaderElectorBuilder.java
index 3f85065d77..7bf7fc906a 100644
--- a/core/src/main/java/io/atomix/core/leadership/impl/LeaderElectorProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/leadership/impl/DefaultLeaderElectorBuilder.java
@@ -28,8 +28,8 @@
 /**
  * Default implementation of {@code LeaderElectorBuilder}.
  */
-public class LeaderElectorProxyBuilder<T> extends LeaderElectorBuilder<T> {
-  public LeaderElectorProxyBuilder(String name, LeaderElectorConfig config, PrimitiveManagementService managementService) {
+public class DefaultLeaderElectorBuilder<T> extends LeaderElectorBuilder<T> {
+  public DefaultLeaderElectorBuilder(String name, LeaderElectorConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/list/DistributedListType.java b/core/src/main/java/io/atomix/core/list/DistributedListType.java
index 8e75544c3d..4e632e4ef8 100644
--- a/core/src/main/java/io/atomix/core/list/DistributedListType.java
+++ b/core/src/main/java/io/atomix/core/list/DistributedListType.java
@@ -19,7 +19,7 @@
 import io.atomix.core.collection.impl.CollectionUpdateResult;
 import io.atomix.core.list.impl.DefaultDistributedListService;
 import io.atomix.core.collection.impl.DistributedCollectionService;
-import io.atomix.core.list.impl.DistributedListProxyBuilder;
+import io.atomix.core.list.impl.DefaultDistributedListBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.service.PrimitiveService;
@@ -78,7 +78,7 @@ public DistributedListConfig newConfig() {
 
   @Override
   public DistributedListBuilder<E> newBuilder(String name, DistributedListConfig config, PrimitiveManagementService managementService) {
-    return new DistributedListProxyBuilder<>(name, config, managementService);
+    return new DefaultDistributedListBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/list/impl/DistributedListProxyBuilder.java b/core/src/main/java/io/atomix/core/list/impl/DefaultDistributedListBuilder.java
similarity index 91%
rename from core/src/main/java/io/atomix/core/list/impl/DistributedListProxyBuilder.java
rename to core/src/main/java/io/atomix/core/list/impl/DefaultDistributedListBuilder.java
index 23207e0ebc..6a34b164d9 100644
--- a/core/src/main/java/io/atomix/core/list/impl/DistributedListProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/list/impl/DefaultDistributedListBuilder.java
@@ -32,8 +32,8 @@
  *
  * @param <E> type for list elements
  */
-public class DistributedListProxyBuilder<E> extends DistributedListBuilder<E> {
-  public DistributedListProxyBuilder(String name, DistributedListConfig config, PrimitiveManagementService managementService) {
+public class DefaultDistributedListBuilder<E> extends DistributedListBuilder<E> {
+  public DefaultDistributedListBuilder(String name, DistributedListConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/lock/DistributedLockType.java b/core/src/main/java/io/atomix/core/lock/DistributedLockType.java
index d743b7bb43..95fa3ab547 100644
--- a/core/src/main/java/io/atomix/core/lock/DistributedLockType.java
+++ b/core/src/main/java/io/atomix/core/lock/DistributedLockType.java
@@ -16,7 +16,7 @@
 package io.atomix.core.lock;
 
 import io.atomix.core.lock.impl.DefaultDistributedLockService;
-import io.atomix.core.lock.impl.DistributedLockProxyBuilder;
+import io.atomix.core.lock.impl.DefaultDistributedLockBuilder;
 import io.atomix.core.lock.impl.DistributedLockResource;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
@@ -65,7 +65,7 @@ public DistributedLockConfig newConfig() {
 
   @Override
   public DistributedLockBuilder newBuilder(String name, DistributedLockConfig config, PrimitiveManagementService managementService) {
-    return new DistributedLockProxyBuilder(name, config, managementService);
+    return new DefaultDistributedLockBuilder(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/lock/impl/DistributedLockProxyBuilder.java b/core/src/main/java/io/atomix/core/lock/impl/DefaultDistributedLockBuilder.java
similarity index 88%
rename from core/src/main/java/io/atomix/core/lock/impl/DistributedLockProxyBuilder.java
rename to core/src/main/java/io/atomix/core/lock/impl/DefaultDistributedLockBuilder.java
index 70a1a44cd5..4f7f48e6ea 100644
--- a/core/src/main/java/io/atomix/core/lock/impl/DistributedLockProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/lock/impl/DefaultDistributedLockBuilder.java
@@ -28,8 +28,8 @@
 /**
  * Default distributed lock builder implementation.
  */
-public class DistributedLockProxyBuilder extends DistributedLockBuilder {
-  public DistributedLockProxyBuilder(String name, DistributedLockConfig config, PrimitiveManagementService managementService) {
+public class DefaultDistributedLockBuilder extends DistributedLockBuilder {
+  public DefaultDistributedLockBuilder(String name, DistributedLockConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/map/AtomicMapType.java b/core/src/main/java/io/atomix/core/map/AtomicMapType.java
index 33826b6857..9f60b69ae2 100644
--- a/core/src/main/java/io/atomix/core/map/AtomicMapType.java
+++ b/core/src/main/java/io/atomix/core/map/AtomicMapType.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.map;
 
-import io.atomix.core.map.impl.AtomicMapProxyBuilder;
+import io.atomix.core.map.impl.DefaultAtomicMapBuilder;
 import io.atomix.core.map.impl.AtomicMapResource;
 import io.atomix.core.map.impl.AtomicMapService;
 import io.atomix.core.map.impl.DefaultAtomicMapService;
@@ -103,7 +103,7 @@ public PrimitiveResource newResource(AtomicMap<K, V> primitive) {
 
   @Override
   public AtomicMapBuilder<K, V> newBuilder(String name, AtomicMapConfig config, PrimitiveManagementService managementService) {
-    return new AtomicMapProxyBuilder<>(name, config, managementService);
+    return new DefaultAtomicMapBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/map/AtomicMapBackedJavaMap.java b/core/src/main/java/io/atomix/core/map/impl/AtomicMapBackedJavaMap.java
similarity index 98%
rename from core/src/main/java/io/atomix/core/map/AtomicMapBackedJavaMap.java
rename to core/src/main/java/io/atomix/core/map/impl/AtomicMapBackedJavaMap.java
index 5dee1e8106..77191f1dc3 100644
--- a/core/src/main/java/io/atomix/core/map/AtomicMapBackedJavaMap.java
+++ b/core/src/main/java/io/atomix/core/map/impl/AtomicMapBackedJavaMap.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.core.map;
+package io.atomix.core.map.impl;
 
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Maps;
+import io.atomix.core.map.AtomicMap;
 import io.atomix.utils.time.Versioned;
 
 import java.util.Collection;
diff --git a/core/src/main/java/io/atomix/core/map/impl/BlockingAtomicMap.java b/core/src/main/java/io/atomix/core/map/impl/BlockingAtomicMap.java
index 00f0a856b1..283b9fbd05 100644
--- a/core/src/main/java/io/atomix/core/map/impl/BlockingAtomicMap.java
+++ b/core/src/main/java/io/atomix/core/map/impl/BlockingAtomicMap.java
@@ -22,7 +22,6 @@
 import io.atomix.core.set.impl.BlockingDistributedSet;
 import io.atomix.core.map.AsyncAtomicMap;
 import io.atomix.core.map.AtomicMap;
-import io.atomix.core.map.AtomicMapBackedJavaMap;
 import io.atomix.core.map.AtomicMapEventListener;
 import io.atomix.primitive.PrimitiveException;
 import io.atomix.primitive.PrimitiveState;
diff --git a/core/src/main/java/io/atomix/core/map/impl/AtomicMapProxyBuilder.java b/core/src/main/java/io/atomix/core/map/impl/DefaultAtomicMapBuilder.java
similarity index 92%
rename from core/src/main/java/io/atomix/core/map/impl/AtomicMapProxyBuilder.java
rename to core/src/main/java/io/atomix/core/map/impl/DefaultAtomicMapBuilder.java
index 1005c7862b..7bf6e46c35 100644
--- a/core/src/main/java/io/atomix/core/map/impl/AtomicMapProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/map/impl/DefaultAtomicMapBuilder.java
@@ -33,8 +33,8 @@
  * @param <K> type for map key
  * @param <V> type for map value
  */
-public class AtomicMapProxyBuilder<K, V> extends AtomicMapBuilder<K, V> {
-  public AtomicMapProxyBuilder(String name, AtomicMapConfig config, PrimitiveManagementService managementService) {
+public class DefaultAtomicMapBuilder<K, V> extends AtomicMapBuilder<K, V> {
+  public DefaultAtomicMapBuilder(String name, AtomicMapConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/multimap/AtomicMultimapType.java b/core/src/main/java/io/atomix/core/multimap/AtomicMultimapType.java
index 0dd09dd7dc..1c36385bf5 100644
--- a/core/src/main/java/io/atomix/core/multimap/AtomicMultimapType.java
+++ b/core/src/main/java/io/atomix/core/multimap/AtomicMultimapType.java
@@ -16,7 +16,7 @@
 package io.atomix.core.multimap;
 
 import com.google.common.collect.Maps;
-import io.atomix.core.multimap.impl.AtomicMultimapProxyBuilder;
+import io.atomix.core.multimap.impl.DefaultAtomicMultimapBuilder;
 import io.atomix.core.multimap.impl.AtomicMultimapService;
 import io.atomix.core.multimap.impl.DefaultAtomicMultimapService;
 import io.atomix.primitive.PrimitiveManagementService;
@@ -79,7 +79,7 @@ public AtomicMultimapConfig newConfig() {
 
   @Override
   public AtomicMultimapBuilder<K, V> newBuilder(String name, AtomicMultimapConfig config, PrimitiveManagementService managementService) {
-    return new AtomicMultimapProxyBuilder<>(name, config, managementService);
+    return new DefaultAtomicMultimapBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/multimap/impl/AtomicMultimapProxyBuilder.java b/core/src/main/java/io/atomix/core/multimap/impl/DefaultAtomicMultimapBuilder.java
similarity index 91%
rename from core/src/main/java/io/atomix/core/multimap/impl/AtomicMultimapProxyBuilder.java
rename to core/src/main/java/io/atomix/core/multimap/impl/DefaultAtomicMultimapBuilder.java
index ae1e9b683e..389d4c0421 100644
--- a/core/src/main/java/io/atomix/core/multimap/impl/AtomicMultimapProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/multimap/impl/DefaultAtomicMultimapBuilder.java
@@ -31,8 +31,8 @@
 /**
  * Default {@link AsyncAtomicMultimap} builder.
  */
-public class AtomicMultimapProxyBuilder<K, V> extends AtomicMultimapBuilder<K, V> {
-  public AtomicMultimapProxyBuilder(String name, AtomicMultimapConfig config, PrimitiveManagementService managementService) {
+public class DefaultAtomicMultimapBuilder<K, V> extends AtomicMultimapBuilder<K, V> {
+  public DefaultAtomicMultimapBuilder(String name, AtomicMultimapConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/multiset/DistributedMultisetType.java b/core/src/main/java/io/atomix/core/multiset/DistributedMultisetType.java
index d84e960e9a..853e59381c 100644
--- a/core/src/main/java/io/atomix/core/multiset/DistributedMultisetType.java
+++ b/core/src/main/java/io/atomix/core/multiset/DistributedMultisetType.java
@@ -19,7 +19,7 @@
 import io.atomix.core.collection.impl.CollectionUpdateResult;
 import io.atomix.core.collection.impl.DistributedCollectionService;
 import io.atomix.core.multiset.impl.DefaultDistributedMultisetService;
-import io.atomix.core.multiset.impl.DistributedMultisetProxyBuilder;
+import io.atomix.core.multiset.impl.DefaultDistributedMultisetBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.service.PrimitiveService;
@@ -78,7 +78,7 @@ public DistributedMultisetConfig newConfig() {
 
   @Override
   public DistributedMultisetBuilder<E> newBuilder(String name, DistributedMultisetConfig config, PrimitiveManagementService managementService) {
-    return new DistributedMultisetProxyBuilder<E>(name, config, managementService);
+    return new DefaultDistributedMultisetBuilder<E>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/multiset/impl/DistributedMultisetProxyBuilder.java b/core/src/main/java/io/atomix/core/multiset/impl/DefaultDistributedMultisetBuilder.java
similarity index 91%
rename from core/src/main/java/io/atomix/core/multiset/impl/DistributedMultisetProxyBuilder.java
rename to core/src/main/java/io/atomix/core/multiset/impl/DefaultDistributedMultisetBuilder.java
index 1804e87e70..a38c573a3d 100644
--- a/core/src/main/java/io/atomix/core/multiset/impl/DistributedMultisetProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/multiset/impl/DefaultDistributedMultisetBuilder.java
@@ -32,8 +32,8 @@
  *
  * @param <E> type for multiset elements
  */
-public class DistributedMultisetProxyBuilder<E> extends DistributedMultisetBuilder<E> {
-  public DistributedMultisetProxyBuilder(String name, DistributedMultisetConfig config, PrimitiveManagementService managementService) {
+public class DefaultDistributedMultisetBuilder<E> extends DistributedMultisetBuilder<E> {
+  public DefaultDistributedMultisetBuilder(String name, DistributedMultisetConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/queue/DistributedQueueType.java b/core/src/main/java/io/atomix/core/queue/DistributedQueueType.java
index 99ea961119..682fbfb64c 100644
--- a/core/src/main/java/io/atomix/core/queue/DistributedQueueType.java
+++ b/core/src/main/java/io/atomix/core/queue/DistributedQueueType.java
@@ -19,7 +19,7 @@
 import io.atomix.core.collection.impl.CollectionUpdateResult;
 import io.atomix.core.queue.impl.DefaultDistributedQueueService;
 import io.atomix.core.collection.impl.DistributedCollectionService;
-import io.atomix.core.queue.impl.DistributedQueueProxyBuilder;
+import io.atomix.core.queue.impl.DefaultDistributedQueueBuilder;
 import io.atomix.core.queue.impl.DistributedQueueResource;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
@@ -86,7 +86,7 @@ public DistributedQueueConfig newConfig() {
 
   @Override
   public DistributedQueueBuilder<E> newBuilder(String name, DistributedQueueConfig config, PrimitiveManagementService managementService) {
-    return new DistributedQueueProxyBuilder<>(name, config, managementService);
+    return new DefaultDistributedQueueBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/queue/impl/DistributedQueueProxyBuilder.java b/core/src/main/java/io/atomix/core/queue/impl/DefaultDistributedQueueBuilder.java
similarity index 91%
rename from core/src/main/java/io/atomix/core/queue/impl/DistributedQueueProxyBuilder.java
rename to core/src/main/java/io/atomix/core/queue/impl/DefaultDistributedQueueBuilder.java
index 88aafa93c9..6957a8c6a1 100644
--- a/core/src/main/java/io/atomix/core/queue/impl/DistributedQueueProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/queue/impl/DefaultDistributedQueueBuilder.java
@@ -32,8 +32,8 @@
  *
  * @param <E> type for queue elements
  */
-public class DistributedQueueProxyBuilder<E> extends DistributedQueueBuilder<E> {
-  public DistributedQueueProxyBuilder(String name, DistributedQueueConfig config, PrimitiveManagementService managementService) {
+public class DefaultDistributedQueueBuilder<E> extends DistributedQueueBuilder<E> {
+  public DefaultDistributedQueueBuilder(String name, DistributedQueueConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/semaphore/DistributedSemaphoreType.java b/core/src/main/java/io/atomix/core/semaphore/DistributedSemaphoreType.java
index 6027f7a380..ac6286b28a 100644
--- a/core/src/main/java/io/atomix/core/semaphore/DistributedSemaphoreType.java
+++ b/core/src/main/java/io/atomix/core/semaphore/DistributedSemaphoreType.java
@@ -16,7 +16,7 @@
 package io.atomix.core.semaphore;
 
 import io.atomix.core.semaphore.impl.DefaultDistributedSemaphoreService;
-import io.atomix.core.semaphore.impl.DistributedSemaphoreProxyBuilder;
+import io.atomix.core.semaphore.impl.DefaultDistributedSemaphoreBuilder;
 import io.atomix.core.semaphore.impl.DistributedSemaphoreResource;
 import io.atomix.core.semaphore.impl.DistributedSemaphoreServiceConfig;
 import io.atomix.primitive.PrimitiveManagementService;
@@ -73,7 +73,7 @@ public DistributedSemaphoreConfig newConfig() {
 
   @Override
   public DistributedSemaphoreBuilder newBuilder(String name, DistributedSemaphoreConfig config, PrimitiveManagementService managementService) {
-    return new DistributedSemaphoreProxyBuilder(name, config, managementService);
+    return new DefaultDistributedSemaphoreBuilder(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/semaphore/impl/DistributedSemaphoreProxyBuilder.java b/core/src/main/java/io/atomix/core/semaphore/impl/DefaultDistributedSemaphoreBuilder.java
similarity index 88%
rename from core/src/main/java/io/atomix/core/semaphore/impl/DistributedSemaphoreProxyBuilder.java
rename to core/src/main/java/io/atomix/core/semaphore/impl/DefaultDistributedSemaphoreBuilder.java
index 5557e29dee..52dde76f6a 100644
--- a/core/src/main/java/io/atomix/core/semaphore/impl/DistributedSemaphoreProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/semaphore/impl/DefaultDistributedSemaphoreBuilder.java
@@ -24,8 +24,8 @@
 
 import java.util.concurrent.CompletableFuture;
 
-public class DistributedSemaphoreProxyBuilder extends DistributedSemaphoreBuilder {
-  public DistributedSemaphoreProxyBuilder(String name, DistributedSemaphoreConfig config, PrimitiveManagementService managementService) {
+public class DefaultDistributedSemaphoreBuilder extends DistributedSemaphoreBuilder {
+  public DefaultDistributedSemaphoreBuilder(String name, DistributedSemaphoreConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/set/DistributedSetType.java b/core/src/main/java/io/atomix/core/set/DistributedSetType.java
index 2f9831bfbf..ba16e45f75 100644
--- a/core/src/main/java/io/atomix/core/set/DistributedSetType.java
+++ b/core/src/main/java/io/atomix/core/set/DistributedSetType.java
@@ -19,7 +19,7 @@
 import io.atomix.core.collection.impl.CollectionUpdateResult;
 import io.atomix.core.set.impl.DefaultDistributedSetService;
 import io.atomix.core.collection.impl.DistributedCollectionService;
-import io.atomix.core.set.impl.DistributedSetProxyBuilder;
+import io.atomix.core.set.impl.DefaultDistributedSetBuilder;
 import io.atomix.core.set.impl.DistributedSetResource;
 import io.atomix.core.set.impl.SetUpdate;
 import io.atomix.core.transaction.TransactionId;
@@ -99,7 +99,7 @@ public DistributedSetConfig newConfig() {
 
   @Override
   public DistributedSetBuilder<E> newBuilder(String name, DistributedSetConfig config, PrimitiveManagementService managementService) {
-    return new DistributedSetProxyBuilder<>(name, config, managementService);
+    return new DefaultDistributedSetBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/set/impl/DistributedSetProxyBuilder.java b/core/src/main/java/io/atomix/core/set/impl/DefaultDistributedSetBuilder.java
similarity index 91%
rename from core/src/main/java/io/atomix/core/set/impl/DistributedSetProxyBuilder.java
rename to core/src/main/java/io/atomix/core/set/impl/DefaultDistributedSetBuilder.java
index 2ed166d621..7d4b0afe0f 100644
--- a/core/src/main/java/io/atomix/core/set/impl/DistributedSetProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/set/impl/DefaultDistributedSetBuilder.java
@@ -32,8 +32,8 @@
  *
  * @param <E> type for set elements
  */
-public class DistributedSetProxyBuilder<E> extends DistributedSetBuilder<E> {
-  public DistributedSetProxyBuilder(String name, DistributedSetConfig config, PrimitiveManagementService managementService) {
+public class DefaultDistributedSetBuilder<E> extends DistributedSetBuilder<E> {
+  public DefaultDistributedSetBuilder(String name, DistributedSetConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/tree/AtomicDocumentTreeType.java b/core/src/main/java/io/atomix/core/tree/AtomicDocumentTreeType.java
index d1891cf70e..b830a85915 100644
--- a/core/src/main/java/io/atomix/core/tree/AtomicDocumentTreeType.java
+++ b/core/src/main/java/io/atomix/core/tree/AtomicDocumentTreeType.java
@@ -21,7 +21,7 @@
 import io.atomix.core.transaction.impl.PrepareResult;
 import io.atomix.core.transaction.impl.RollbackResult;
 import io.atomix.core.tree.impl.DefaultDocumentTreeService;
-import io.atomix.core.tree.impl.AtomicDocumentTreeProxyBuilder;
+import io.atomix.core.tree.impl.DefaultAtomicDocumentTreeBuilder;
 import io.atomix.core.tree.impl.DocumentTreeResource;
 import io.atomix.core.tree.impl.DocumentTreeResult;
 import io.atomix.core.tree.impl.NodeUpdate;
@@ -103,7 +103,7 @@ public AtomicDocumentTreeConfig newConfig() {
 
   @Override
   public AtomicDocumentTreeBuilder<V> newBuilder(String name, AtomicDocumentTreeConfig config, PrimitiveManagementService managementService) {
-    return new AtomicDocumentTreeProxyBuilder<>(name, config, managementService);
+    return new DefaultAtomicDocumentTreeBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/tree/impl/AtomicDocumentTreeProxyBuilder.java b/core/src/main/java/io/atomix/core/tree/impl/DefaultAtomicDocumentTreeBuilder.java
similarity index 89%
rename from core/src/main/java/io/atomix/core/tree/impl/AtomicDocumentTreeProxyBuilder.java
rename to core/src/main/java/io/atomix/core/tree/impl/DefaultAtomicDocumentTreeBuilder.java
index 7aecb6a8e7..7096642b3a 100644
--- a/core/src/main/java/io/atomix/core/tree/impl/AtomicDocumentTreeProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/tree/impl/DefaultAtomicDocumentTreeBuilder.java
@@ -31,8 +31,8 @@
  *
  * @param <V> type for document tree value
  */
-public class AtomicDocumentTreeProxyBuilder<V> extends AtomicDocumentTreeBuilder<V> {
-  public AtomicDocumentTreeProxyBuilder(String name, AtomicDocumentTreeConfig config, PrimitiveManagementService managementService) {
+public class DefaultAtomicDocumentTreeBuilder<V> extends AtomicDocumentTreeBuilder<V> {
+  public DefaultAtomicDocumentTreeBuilder(String name, AtomicDocumentTreeConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/treemap/AtomicTreeMapType.java b/core/src/main/java/io/atomix/core/treemap/AtomicTreeMapType.java
index e4b27984bc..ba3b6bb86a 100644
--- a/core/src/main/java/io/atomix/core/treemap/AtomicTreeMapType.java
+++ b/core/src/main/java/io/atomix/core/treemap/AtomicTreeMapType.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.treemap;
 
-import io.atomix.core.treemap.impl.AtomicTreeMapProxyBuilder;
+import io.atomix.core.treemap.impl.DefaultAtomicTreeMapBuilder;
 import io.atomix.core.treemap.impl.DefaultAtomicTreeMapService;
 import io.atomix.core.map.AtomicMapType;
 import io.atomix.primitive.PrimitiveManagementService;
@@ -67,7 +67,7 @@ public AtomicTreeMapConfig newConfig() {
 
   @Override
   public AtomicTreeMapBuilder<V> newBuilder(String name, AtomicTreeMapConfig config, PrimitiveManagementService managementService) {
-    return new AtomicTreeMapProxyBuilder<>(name, config, managementService);
+    return new DefaultAtomicTreeMapBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/treemap/impl/BlockingAtomicTreeMap.java b/core/src/main/java/io/atomix/core/treemap/impl/BlockingAtomicTreeMap.java
index fa1b326a5a..1ea2f6a5f7 100644
--- a/core/src/main/java/io/atomix/core/treemap/impl/BlockingAtomicTreeMap.java
+++ b/core/src/main/java/io/atomix/core/treemap/impl/BlockingAtomicTreeMap.java
@@ -22,7 +22,7 @@
 import io.atomix.core.collection.impl.BlockingDistributedCollection;
 import io.atomix.core.set.impl.BlockingDistributedSet;
 import io.atomix.core.treemap.AsyncAtomicTreeMap;
-import io.atomix.core.map.AtomicMapBackedJavaMap;
+import io.atomix.core.map.impl.AtomicMapBackedJavaMap;
 import io.atomix.core.treemap.AtomicTreeMap;
 import io.atomix.core.map.AtomicMapEventListener;
 import io.atomix.primitive.PrimitiveException;
diff --git a/core/src/main/java/io/atomix/core/treemap/impl/AtomicTreeMapProxyBuilder.java b/core/src/main/java/io/atomix/core/treemap/impl/DefaultAtomicTreeMapBuilder.java
similarity index 90%
rename from core/src/main/java/io/atomix/core/treemap/impl/AtomicTreeMapProxyBuilder.java
rename to core/src/main/java/io/atomix/core/treemap/impl/DefaultAtomicTreeMapBuilder.java
index 6cbd5d58e2..89dce7e1db 100644
--- a/core/src/main/java/io/atomix/core/treemap/impl/AtomicTreeMapProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/treemap/impl/DefaultAtomicTreeMapBuilder.java
@@ -31,8 +31,8 @@
  *
  * @param <V> type for map value
  */
-public class AtomicTreeMapProxyBuilder<V> extends AtomicTreeMapBuilder<V> {
-  public AtomicTreeMapProxyBuilder(String name, AtomicTreeMapConfig config, PrimitiveManagementService managementService) {
+public class DefaultAtomicTreeMapBuilder<V> extends AtomicTreeMapBuilder<V> {
+  public DefaultAtomicTreeMapBuilder(String name, AtomicTreeMapConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/value/AtomicValueType.java b/core/src/main/java/io/atomix/core/value/AtomicValueType.java
index 040e7bc981..0eadda06b3 100644
--- a/core/src/main/java/io/atomix/core/value/AtomicValueType.java
+++ b/core/src/main/java/io/atomix/core/value/AtomicValueType.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.value;
 
-import io.atomix.core.value.impl.AtomicValueProxyBuilder;
+import io.atomix.core.value.impl.DefaultAtomicValueBuilder;
 import io.atomix.core.value.impl.AtomicValueResource;
 import io.atomix.core.value.impl.DefaultAtomicValueService;
 import io.atomix.primitive.PrimitiveManagementService;
@@ -67,7 +67,7 @@ public AtomicValueConfig newConfig() {
 
   @Override
   public AtomicValueBuilder<V> newBuilder(String name, AtomicValueConfig config, PrimitiveManagementService managementService) {
-    return new AtomicValueProxyBuilder<>(name, config, managementService);
+    return new DefaultAtomicValueBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/value/impl/AtomicValueProxyBuilder.java b/core/src/main/java/io/atomix/core/value/impl/DefaultAtomicValueBuilder.java
similarity index 90%
rename from core/src/main/java/io/atomix/core/value/impl/AtomicValueProxyBuilder.java
rename to core/src/main/java/io/atomix/core/value/impl/DefaultAtomicValueBuilder.java
index 2759c981a5..1e5389e168 100644
--- a/core/src/main/java/io/atomix/core/value/impl/AtomicValueProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/value/impl/DefaultAtomicValueBuilder.java
@@ -30,8 +30,8 @@
  *
  * @param <V> value type
  */
-public class AtomicValueProxyBuilder<V> extends AtomicValueBuilder<V> {
-  public AtomicValueProxyBuilder(String name, AtomicValueConfig config, PrimitiveManagementService managementService) {
+public class DefaultAtomicValueBuilder<V> extends AtomicValueBuilder<V> {
+  public DefaultAtomicValueBuilder(String name, AtomicValueConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }
 
diff --git a/core/src/main/java/io/atomix/core/workqueue/WorkQueueType.java b/core/src/main/java/io/atomix/core/workqueue/WorkQueueType.java
index 10943a9de5..12296b9016 100644
--- a/core/src/main/java/io/atomix/core/workqueue/WorkQueueType.java
+++ b/core/src/main/java/io/atomix/core/workqueue/WorkQueueType.java
@@ -16,7 +16,7 @@
 package io.atomix.core.workqueue;
 
 import io.atomix.core.workqueue.impl.DefaultWorkQueueService;
-import io.atomix.core.workqueue.impl.WorkQueueProxyBuilder;
+import io.atomix.core.workqueue.impl.DefaultWorkQueueBuilder;
 import io.atomix.core.workqueue.impl.WorkQueueResource;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
@@ -79,7 +79,7 @@ public WorkQueueConfig newConfig() {
 
   @Override
   public WorkQueueBuilder<E> newBuilder(String name, WorkQueueConfig config, PrimitiveManagementService managementService) {
-    return new WorkQueueProxyBuilder<>(name, config, managementService);
+    return new DefaultWorkQueueBuilder<>(name, config, managementService);
   }
 
   @Override
diff --git a/core/src/main/java/io/atomix/core/workqueue/impl/WorkQueueProxyBuilder.java b/core/src/main/java/io/atomix/core/workqueue/impl/DefaultWorkQueueBuilder.java
similarity index 90%
rename from core/src/main/java/io/atomix/core/workqueue/impl/WorkQueueProxyBuilder.java
rename to core/src/main/java/io/atomix/core/workqueue/impl/DefaultWorkQueueBuilder.java
index 4edef0b789..95bd95cd9f 100644
--- a/core/src/main/java/io/atomix/core/workqueue/impl/WorkQueueProxyBuilder.java
+++ b/core/src/main/java/io/atomix/core/workqueue/impl/DefaultWorkQueueBuilder.java
@@ -28,8 +28,8 @@
 /**
  * Default work queue builder implementation.
  */
-public class WorkQueueProxyBuilder<E> extends WorkQueueBuilder<E> {
-  public WorkQueueProxyBuilder(String name, WorkQueueConfig config, PrimitiveManagementService managementService) {
+public class DefaultWorkQueueBuilder<E> extends WorkQueueBuilder<E> {
+  public DefaultWorkQueueBuilder(String name, WorkQueueConfig config, PrimitiveManagementService managementService) {
     super(name, config, managementService);
   }