Rename misleadingly named primitive builder implementations.

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

core/src/main/java/io/atomix/core/barrier/impl/DistributedCyclicBarrierProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/counter/impl/AtomicCounterProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/countermap/impl/AtomicCounterMapProxyBuilder.java → 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);
   }
 

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

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

core/src/main/java/io/atomix/core/leadership/impl/LeaderElectionProxyBuilder.java → 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);
   }
 

core/src/main/java/io/atomix/core/leadership/impl/LeaderElectorProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/list/impl/DistributedListProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/lock/impl/DistributedLockProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/map/AtomicMapBackedJavaMap.java → 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;

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;

core/src/main/java/io/atomix/core/map/impl/AtomicMapProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/multimap/impl/AtomicMultimapProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/multiset/impl/DistributedMultisetProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/queue/impl/DistributedQueueProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/semaphore/impl/DistributedSemaphoreProxyBuilder.java → 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);
   }
 

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

core/src/main/java/io/atomix/core/set/impl/DistributedSetProxyBuilder.java → 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);
   }