From ab207463ac2f4b5d625641fa2620abe6ea562a97 Mon Sep 17 00:00:00 2001
From: Jordan Halterman <jordan.halterman@gmail.com>
Date: Wed, 4 Jul 2018 16:48:39 -0700
Subject: [PATCH] Rename base DistributedPrimitiveBuilder to PrimitiveBuilder
 with consistency with other primitive-related class names.

---
 core/src/main/java/io/atomix/core/Atomix.java               | 4 ++--
 core/src/main/java/io/atomix/core/PrimitivesService.java    | 6 +++---
 .../core/barrier/DistributedCyclicBarrierBuilder.java       | 4 ++--
 .../java/io/atomix/core/counter/AtomicCounterBuilder.java   | 4 ++--
 .../io/atomix/core/countermap/AtomicCounterMapBuilder.java  | 4 ++--
 .../atomix/core/idgenerator/AtomicIdGeneratorBuilder.java   | 4 ++--
 .../java/io/atomix/core/impl/CorePrimitivesService.java     | 4 ++--
 .../io/atomix/core/leadership/LeaderElectionBuilder.java    | 4 ++--
 .../io/atomix/core/leadership/LeaderElectorBuilder.java     | 4 ++--
 .../java/io/atomix/core/list/DistributedListBuilder.java    | 4 ++--
 .../java/io/atomix/core/lock/DistributedLockBuilder.java    | 4 ++--
 core/src/main/java/io/atomix/core/map/AtomicMapBuilder.java | 4 ++--
 .../java/io/atomix/core/multimap/AtomicMultimapBuilder.java | 4 ++--
 .../io/atomix/core/multiset/DistributedMultisetBuilder.java | 4 ++--
 .../java/io/atomix/core/queue/DistributedQueueBuilder.java  | 4 ++--
 .../atomix/core/semaphore/DistributedSemaphoreBuilder.java  | 4 ++--
 .../main/java/io/atomix/core/set/DistributedSetBuilder.java | 4 ++--
 .../java/io/atomix/core/transaction/TransactionBuilder.java | 4 ++--
 .../io/atomix/core/transaction/TransactionalMapBuilder.java | 4 ++--
 .../io/atomix/core/transaction/TransactionalSetBuilder.java | 4 ++--
 .../java/io/atomix/core/tree/AtomicDocumentTreeBuilder.java | 4 ++--
 .../java/io/atomix/core/treemap/AtomicTreeMapBuilder.java   | 4 ++--
 .../main/java/io/atomix/core/value/AtomicValueBuilder.java  | 4 ++--
 .../java/io/atomix/core/workqueue/WorkQueueBuilder.java     | 4 ++--
 ...stributedPrimitiveBuilder.java => PrimitiveBuilder.java} | 4 ++--
 .../src/main/java/io/atomix/primitive/PrimitiveType.java    | 2 +-
 .../atomix/primitive/partition/impl/PrimaryElectorType.java | 4 ++--
 .../primitive/session/impl/SessionIdGeneratorType.java      | 4 ++--
 .../test/java/io/atomix/primitive/TestPrimitiveType.java    | 2 +-
 .../java/io/atomix/protocols/backup/PrimaryBackupTest.java  | 4 ++--
 .../src/test/java/io/atomix/protocols/raft/RaftTest.java    | 4 ++--
 .../java/io/atomix/protocols/raft/TestPrimitiveType.java    | 4 ++--
 .../java/io/atomix/protocols/raft/test/RaftFuzzTest.java    | 4 ++--
 .../io/atomix/protocols/raft/test/RaftPerformanceTest.java  | 4 ++--
 34 files changed, 67 insertions(+), 67 deletions(-)
 rename primitive/src/main/java/io/atomix/primitive/{DistributedPrimitiveBuilder.java => PrimitiveBuilder.java} (95%)

diff --git a/core/src/main/java/io/atomix/core/Atomix.java b/core/src/main/java/io/atomix/core/Atomix.java
index 5dd4be8aef..8e28577c75 100644
--- a/core/src/main/java/io/atomix/core/Atomix.java
+++ b/core/src/main/java/io/atomix/core/Atomix.java
@@ -47,7 +47,7 @@
 import io.atomix.core.value.AtomicValue;
 import io.atomix.core.workqueue.WorkQueue;
 import io.atomix.primitive.DistributedPrimitive;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveInfo;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.config.ConfigService;
@@ -338,7 +338,7 @@ public TransactionBuilder transactionBuilder(String name) {
   }
 
   @Override
-  public <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
+  public <B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
       String name,
       PrimitiveType<B, C, P> primitiveType) {
     return primitives.primitiveBuilder(name, primitiveType);
diff --git a/core/src/main/java/io/atomix/core/PrimitivesService.java b/core/src/main/java/io/atomix/core/PrimitivesService.java
index 31e5234dff..0bfe18b227 100644
--- a/core/src/main/java/io/atomix/core/PrimitivesService.java
+++ b/core/src/main/java/io/atomix/core/PrimitivesService.java
@@ -71,7 +71,7 @@
 import io.atomix.core.workqueue.WorkQueueType;
 import io.atomix.core.transaction.TransactionBuilder;
 import io.atomix.primitive.DistributedPrimitive;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveInfo;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.config.PrimitiveConfig;
@@ -705,7 +705,7 @@ <C extends PrimitiveConfig<C>, P extends DistributedPrimitive> P getPrimitive(
    * @param <P>           the primitive type
    * @return the primitive builder
    */
-  <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
+  <B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
       String name,
       PrimitiveType<B, C, P> primitiveType);
 
@@ -719,7 +719,7 @@ <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P
    * @param <P>           the primitive type
    * @return the primitive builder
    */
-  default <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
+  default <B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
       String name,
       PrimitiveType<B, C, P> primitiveType,
       PrimitiveProtocol protocol) {
diff --git a/core/src/main/java/io/atomix/core/barrier/DistributedCyclicBarrierBuilder.java b/core/src/main/java/io/atomix/core/barrier/DistributedCyclicBarrierBuilder.java
index ff5800bd6c..a7ced19310 100644
--- a/core/src/main/java/io/atomix/core/barrier/DistributedCyclicBarrierBuilder.java
+++ b/core/src/main/java/io/atomix/core/barrier/DistributedCyclicBarrierBuilder.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.barrier;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -24,7 +24,7 @@
  * Distributed cyclic barrier builder.
  */
 public abstract class DistributedCyclicBarrierBuilder
-    extends DistributedPrimitiveBuilder<DistributedCyclicBarrierBuilder, DistributedCyclicBarrierConfig, DistributedCyclicBarrier> {
+    extends PrimitiveBuilder<DistributedCyclicBarrierBuilder, DistributedCyclicBarrierConfig, DistributedCyclicBarrier> {
 
   protected Runnable barrierAction = () -> {};
 
diff --git a/core/src/main/java/io/atomix/core/counter/AtomicCounterBuilder.java b/core/src/main/java/io/atomix/core/counter/AtomicCounterBuilder.java
index 57f5fb1178..52b8ae0416 100644
--- a/core/src/main/java/io/atomix/core/counter/AtomicCounterBuilder.java
+++ b/core/src/main/java/io/atomix/core/counter/AtomicCounterBuilder.java
@@ -15,14 +15,14 @@
  */
 package io.atomix.core.counter;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Builder for AtomicCounter.
  */
 public abstract class AtomicCounterBuilder
-    extends DistributedPrimitiveBuilder<AtomicCounterBuilder, AtomicCounterConfig, AtomicCounter> {
+    extends PrimitiveBuilder<AtomicCounterBuilder, AtomicCounterConfig, AtomicCounter> {
   public AtomicCounterBuilder(String name, AtomicCounterConfig config, PrimitiveManagementService managementService) {
     super(AtomicCounterType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/countermap/AtomicCounterMapBuilder.java b/core/src/main/java/io/atomix/core/countermap/AtomicCounterMapBuilder.java
index b49ee30695..a646d89a21 100644
--- a/core/src/main/java/io/atomix/core/countermap/AtomicCounterMapBuilder.java
+++ b/core/src/main/java/io/atomix/core/countermap/AtomicCounterMapBuilder.java
@@ -16,14 +16,14 @@
 package io.atomix.core.countermap;
 
 import io.atomix.core.counter.AtomicCounterMap;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Builder for AtomicCounterMap.
  */
 public abstract class AtomicCounterMapBuilder<K>
-    extends DistributedPrimitiveBuilder<AtomicCounterMapBuilder<K>, AtomicCounterMapConfig, AtomicCounterMap<K>> {
+    extends PrimitiveBuilder<AtomicCounterMapBuilder<K>, AtomicCounterMapConfig, AtomicCounterMap<K>> {
   public AtomicCounterMapBuilder(String name, AtomicCounterMapConfig config, PrimitiveManagementService managementService) {
     super(AtomicCounterMapType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/idgenerator/AtomicIdGeneratorBuilder.java b/core/src/main/java/io/atomix/core/idgenerator/AtomicIdGeneratorBuilder.java
index e3e49fda5a..aae672b77c 100644
--- a/core/src/main/java/io/atomix/core/idgenerator/AtomicIdGeneratorBuilder.java
+++ b/core/src/main/java/io/atomix/core/idgenerator/AtomicIdGeneratorBuilder.java
@@ -15,14 +15,14 @@
  */
 package io.atomix.core.idgenerator;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Builder for AtomicIdGenerator.
  */
 public abstract class AtomicIdGeneratorBuilder
-    extends DistributedPrimitiveBuilder<AtomicIdGeneratorBuilder, AtomicIdGeneratorConfig, AtomicIdGenerator> {
+    extends PrimitiveBuilder<AtomicIdGeneratorBuilder, AtomicIdGeneratorConfig, AtomicIdGenerator> {
   protected AtomicIdGeneratorBuilder(String name, AtomicIdGeneratorConfig config, PrimitiveManagementService managementService) {
     super(AtomicIdGeneratorType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/impl/CorePrimitivesService.java b/core/src/main/java/io/atomix/core/impl/CorePrimitivesService.java
index 839e156bcf..7bd5643e7f 100644
--- a/core/src/main/java/io/atomix/core/impl/CorePrimitivesService.java
+++ b/core/src/main/java/io/atomix/core/impl/CorePrimitivesService.java
@@ -65,7 +65,7 @@
 import io.atomix.core.workqueue.WorkQueue;
 import io.atomix.core.workqueue.WorkQueueType;
 import io.atomix.primitive.DistributedPrimitive;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.ManagedPrimitiveRegistry;
 import io.atomix.primitive.PrimitiveInfo;
 import io.atomix.primitive.PrimitiveManagementService;
@@ -234,7 +234,7 @@ public <E> WorkQueue<E> getWorkQueue(String name) {
   }
 
   @Override
-  public <B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
+  public <B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig<C>, P extends DistributedPrimitive> B primitiveBuilder(
       String name, PrimitiveType<B, C, P> primitiveType) {
     return primitiveType.newBuilder(name, primitiveType.newConfig(), managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/leadership/LeaderElectionBuilder.java b/core/src/main/java/io/atomix/core/leadership/LeaderElectionBuilder.java
index 8ba5d0e039..bb5f9705d2 100644
--- a/core/src/main/java/io/atomix/core/leadership/LeaderElectionBuilder.java
+++ b/core/src/main/java/io/atomix/core/leadership/LeaderElectionBuilder.java
@@ -16,7 +16,7 @@
 package io.atomix.core.leadership;
 
 import io.atomix.cluster.MemberId;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.utils.serializer.Namespace;
 import io.atomix.utils.serializer.NamespaceConfig;
@@ -27,7 +27,7 @@
  * Builder for constructing new {@link AsyncLeaderElection} instances.
  */
 public abstract class LeaderElectionBuilder<T>
-    extends DistributedPrimitiveBuilder<LeaderElectionBuilder<T>, LeaderElectionConfig, LeaderElection<T>> {
+    extends PrimitiveBuilder<LeaderElectionBuilder<T>, LeaderElectionConfig, LeaderElection<T>> {
 
   public LeaderElectionBuilder(String name, LeaderElectionConfig config, PrimitiveManagementService managementService) {
     super(LeaderElectionType.instance(), name, config, managementService);
diff --git a/core/src/main/java/io/atomix/core/leadership/LeaderElectorBuilder.java b/core/src/main/java/io/atomix/core/leadership/LeaderElectorBuilder.java
index f20a9eebb3..8e9c3fce74 100644
--- a/core/src/main/java/io/atomix/core/leadership/LeaderElectorBuilder.java
+++ b/core/src/main/java/io/atomix/core/leadership/LeaderElectorBuilder.java
@@ -16,7 +16,7 @@
 package io.atomix.core.leadership;
 
 import io.atomix.cluster.MemberId;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.utils.serializer.Namespace;
 import io.atomix.utils.serializer.NamespaceConfig;
@@ -27,7 +27,7 @@
  * Builder for constructing new {@link AsyncLeaderElector} instances.
  */
 public abstract class LeaderElectorBuilder<T>
-    extends DistributedPrimitiveBuilder<LeaderElectorBuilder<T>, LeaderElectorConfig, LeaderElector<T>> {
+    extends PrimitiveBuilder<LeaderElectorBuilder<T>, LeaderElectorConfig, LeaderElector<T>> {
   public LeaderElectorBuilder(String name, LeaderElectorConfig config, PrimitiveManagementService managementService) {
     super(LeaderElectorType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/list/DistributedListBuilder.java b/core/src/main/java/io/atomix/core/list/DistributedListBuilder.java
index ba3ff966cb..f50aed4e11 100644
--- a/core/src/main/java/io/atomix/core/list/DistributedListBuilder.java
+++ b/core/src/main/java/io/atomix/core/list/DistributedListBuilder.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.list;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
@@ -23,7 +23,7 @@
  *
  * @param <E> queue element type
  */
-public abstract class DistributedListBuilder<E> extends DistributedPrimitiveBuilder<DistributedListBuilder<E>, DistributedListConfig, DistributedList<E>> {
+public abstract class DistributedListBuilder<E> extends PrimitiveBuilder<DistributedListBuilder<E>, DistributedListConfig, DistributedList<E>> {
   public DistributedListBuilder(String name, DistributedListConfig config, PrimitiveManagementService managementService) {
     super(DistributedListType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/lock/DistributedLockBuilder.java b/core/src/main/java/io/atomix/core/lock/DistributedLockBuilder.java
index 948b663762..ad3e9f5c32 100644
--- a/core/src/main/java/io/atomix/core/lock/DistributedLockBuilder.java
+++ b/core/src/main/java/io/atomix/core/lock/DistributedLockBuilder.java
@@ -15,14 +15,14 @@
  */
 package io.atomix.core.lock;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Builder for AtomicIdGenerator.
  */
 public abstract class DistributedLockBuilder
-    extends DistributedPrimitiveBuilder<DistributedLockBuilder, DistributedLockConfig, DistributedLock> {
+    extends PrimitiveBuilder<DistributedLockBuilder, DistributedLockConfig, DistributedLock> {
   public DistributedLockBuilder(String name, DistributedLockConfig config, PrimitiveManagementService managementService) {
     super(DistributedLockType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/map/AtomicMapBuilder.java b/core/src/main/java/io/atomix/core/map/AtomicMapBuilder.java
index b4d89365db..079b93a376 100644
--- a/core/src/main/java/io/atomix/core/map/AtomicMapBuilder.java
+++ b/core/src/main/java/io/atomix/core/map/AtomicMapBuilder.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.map;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
@@ -25,7 +25,7 @@
  * @param <V> type for map value
  */
 public abstract class AtomicMapBuilder<K, V>
-    extends DistributedPrimitiveBuilder<AtomicMapBuilder<K, V>, AtomicMapConfig, AtomicMap<K, V>> {
+    extends PrimitiveBuilder<AtomicMapBuilder<K, V>, AtomicMapConfig, AtomicMap<K, V>> {
 
   public AtomicMapBuilder(String name, AtomicMapConfig config, PrimitiveManagementService managementService) {
     super(AtomicMapType.instance(), name, config, managementService);
diff --git a/core/src/main/java/io/atomix/core/multimap/AtomicMultimapBuilder.java b/core/src/main/java/io/atomix/core/multimap/AtomicMultimapBuilder.java
index c28b2553b3..c7311c7b11 100644
--- a/core/src/main/java/io/atomix/core/multimap/AtomicMultimapBuilder.java
+++ b/core/src/main/java/io/atomix/core/multimap/AtomicMultimapBuilder.java
@@ -16,14 +16,14 @@
 
 package io.atomix.core.multimap;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * A builder class for {@code AsyncConsistentMultimap}.
  */
 public abstract class AtomicMultimapBuilder<K, V>
-    extends DistributedPrimitiveBuilder<AtomicMultimapBuilder<K, V>, AtomicMultimapConfig, AtomicMultimap<K, V>> {
+    extends PrimitiveBuilder<AtomicMultimapBuilder<K, V>, AtomicMultimapConfig, AtomicMultimap<K, V>> {
   public AtomicMultimapBuilder(String name, AtomicMultimapConfig config, PrimitiveManagementService managementService) {
     super(AtomicMultimapType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/multiset/DistributedMultisetBuilder.java b/core/src/main/java/io/atomix/core/multiset/DistributedMultisetBuilder.java
index 8680487e5e..0f5ba08d78 100644
--- a/core/src/main/java/io/atomix/core/multiset/DistributedMultisetBuilder.java
+++ b/core/src/main/java/io/atomix/core/multiset/DistributedMultisetBuilder.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.multiset;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
@@ -23,7 +23,7 @@
  *
  * @param <E> multiset element type
  */
-public abstract class DistributedMultisetBuilder<E> extends DistributedPrimitiveBuilder<DistributedMultisetBuilder<E>, DistributedMultisetConfig, DistributedMultiset<E>> {
+public abstract class DistributedMultisetBuilder<E> extends PrimitiveBuilder<DistributedMultisetBuilder<E>, DistributedMultisetConfig, DistributedMultiset<E>> {
   public DistributedMultisetBuilder(String name, DistributedMultisetConfig config, PrimitiveManagementService managementService) {
     super(DistributedMultisetType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/queue/DistributedQueueBuilder.java b/core/src/main/java/io/atomix/core/queue/DistributedQueueBuilder.java
index d3c4c470d8..cedd8552fb 100644
--- a/core/src/main/java/io/atomix/core/queue/DistributedQueueBuilder.java
+++ b/core/src/main/java/io/atomix/core/queue/DistributedQueueBuilder.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.queue;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
@@ -23,7 +23,7 @@
  *
  * @param <E> queue element type
  */
-public abstract class DistributedQueueBuilder<E> extends DistributedPrimitiveBuilder<DistributedQueueBuilder<E>, DistributedQueueConfig, DistributedQueue<E>> {
+public abstract class DistributedQueueBuilder<E> extends PrimitiveBuilder<DistributedQueueBuilder<E>, DistributedQueueConfig, DistributedQueue<E>> {
   public DistributedQueueBuilder(String name, DistributedQueueConfig config, PrimitiveManagementService managementService) {
     super(DistributedQueueType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/semaphore/DistributedSemaphoreBuilder.java b/core/src/main/java/io/atomix/core/semaphore/DistributedSemaphoreBuilder.java
index 487dcae669..153c6eea02 100644
--- a/core/src/main/java/io/atomix/core/semaphore/DistributedSemaphoreBuilder.java
+++ b/core/src/main/java/io/atomix/core/semaphore/DistributedSemaphoreBuilder.java
@@ -15,11 +15,11 @@
  */
 package io.atomix.core.semaphore;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 public abstract class DistributedSemaphoreBuilder
-        extends DistributedPrimitiveBuilder<DistributedSemaphoreBuilder, DistributedSemaphoreConfig, DistributedSemaphore> {
+        extends PrimitiveBuilder<DistributedSemaphoreBuilder, DistributedSemaphoreConfig, DistributedSemaphore> {
   public DistributedSemaphoreBuilder(String name, DistributedSemaphoreConfig config, PrimitiveManagementService managementService) {
     super(DistributedSemaphoreType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/set/DistributedSetBuilder.java b/core/src/main/java/io/atomix/core/set/DistributedSetBuilder.java
index 2a5dcb1ead..95acef6432 100644
--- a/core/src/main/java/io/atomix/core/set/DistributedSetBuilder.java
+++ b/core/src/main/java/io/atomix/core/set/DistributedSetBuilder.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.set;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
@@ -23,7 +23,7 @@
  *
  * @param <E> type set elements.
  */
-public abstract class DistributedSetBuilder<E> extends DistributedPrimitiveBuilder<DistributedSetBuilder<E>, DistributedSetConfig, DistributedSet<E>> {
+public abstract class DistributedSetBuilder<E> extends PrimitiveBuilder<DistributedSetBuilder<E>, DistributedSetConfig, DistributedSet<E>> {
   public DistributedSetBuilder(String name, DistributedSetConfig config, PrimitiveManagementService managementService) {
     super(DistributedSetType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/transaction/TransactionBuilder.java b/core/src/main/java/io/atomix/core/transaction/TransactionBuilder.java
index 1ac2cca3be..050cedf13e 100644
--- a/core/src/main/java/io/atomix/core/transaction/TransactionBuilder.java
+++ b/core/src/main/java/io/atomix/core/transaction/TransactionBuilder.java
@@ -15,13 +15,13 @@
  */
 package io.atomix.core.transaction;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Transaction builder.
  */
-public abstract class TransactionBuilder extends DistributedPrimitiveBuilder<TransactionBuilder, TransactionConfig, Transaction> {
+public abstract class TransactionBuilder extends PrimitiveBuilder<TransactionBuilder, TransactionConfig, Transaction> {
   protected TransactionBuilder(String name, TransactionConfig config, PrimitiveManagementService managementService) {
     super(TransactionType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/transaction/TransactionalMapBuilder.java b/core/src/main/java/io/atomix/core/transaction/TransactionalMapBuilder.java
index 5e3d453e46..56ef235c5b 100644
--- a/core/src/main/java/io/atomix/core/transaction/TransactionalMapBuilder.java
+++ b/core/src/main/java/io/atomix/core/transaction/TransactionalMapBuilder.java
@@ -16,14 +16,14 @@
 package io.atomix.core.transaction;
 
 import io.atomix.core.map.AtomicMapType;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Transactional map builder.
  */
 public abstract class TransactionalMapBuilder<K, V>
-    extends DistributedPrimitiveBuilder<TransactionalMapBuilder<K, V>, TransactionalMapConfig, TransactionalMap<K, V>> {
+    extends PrimitiveBuilder<TransactionalMapBuilder<K, V>, TransactionalMapConfig, TransactionalMap<K, V>> {
   protected TransactionalMapBuilder(String name, TransactionalMapConfig config, PrimitiveManagementService managementService) {
     super(AtomicMapType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/transaction/TransactionalSetBuilder.java b/core/src/main/java/io/atomix/core/transaction/TransactionalSetBuilder.java
index 54a8310534..15d9558e2d 100644
--- a/core/src/main/java/io/atomix/core/transaction/TransactionalSetBuilder.java
+++ b/core/src/main/java/io/atomix/core/transaction/TransactionalSetBuilder.java
@@ -16,14 +16,14 @@
 package io.atomix.core.transaction;
 
 import io.atomix.core.set.DistributedSetType;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Transactional set builder.
  */
 public abstract class TransactionalSetBuilder<E>
-    extends DistributedPrimitiveBuilder<TransactionalSetBuilder<E>, TransactionalSetConfig, TransactionalSet<E>> {
+    extends PrimitiveBuilder<TransactionalSetBuilder<E>, TransactionalSetConfig, TransactionalSet<E>> {
   protected TransactionalSetBuilder(String name, TransactionalSetConfig config, PrimitiveManagementService managementService) {
     super(DistributedSetType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/tree/AtomicDocumentTreeBuilder.java b/core/src/main/java/io/atomix/core/tree/AtomicDocumentTreeBuilder.java
index 2d14ab45d2..1d0370f3c6 100644
--- a/core/src/main/java/io/atomix/core/tree/AtomicDocumentTreeBuilder.java
+++ b/core/src/main/java/io/atomix/core/tree/AtomicDocumentTreeBuilder.java
@@ -16,14 +16,14 @@
 
 package io.atomix.core.tree;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Builder for {@link AtomicDocumentTree}.
  */
 public abstract class AtomicDocumentTreeBuilder<V>
-    extends DistributedPrimitiveBuilder<AtomicDocumentTreeBuilder<V>, AtomicDocumentTreeConfig, AtomicDocumentTree<V>> {
+    extends PrimitiveBuilder<AtomicDocumentTreeBuilder<V>, AtomicDocumentTreeConfig, AtomicDocumentTree<V>> {
   protected AtomicDocumentTreeBuilder(String name, AtomicDocumentTreeConfig config, PrimitiveManagementService managementService) {
     super(AtomicDocumentTreeType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/treemap/AtomicTreeMapBuilder.java b/core/src/main/java/io/atomix/core/treemap/AtomicTreeMapBuilder.java
index 1b1f89c995..ac01101a6b 100644
--- a/core/src/main/java/io/atomix/core/treemap/AtomicTreeMapBuilder.java
+++ b/core/src/main/java/io/atomix/core/treemap/AtomicTreeMapBuilder.java
@@ -16,14 +16,14 @@
 
 package io.atomix.core.treemap;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Builder for {@link AtomicTreeMap}.
  */
 public abstract class AtomicTreeMapBuilder<V>
-    extends DistributedPrimitiveBuilder<AtomicTreeMapBuilder<V>, AtomicTreeMapConfig, AtomicTreeMap<V>> {
+    extends PrimitiveBuilder<AtomicTreeMapBuilder<V>, AtomicTreeMapConfig, AtomicTreeMap<V>> {
   public AtomicTreeMapBuilder(String name, AtomicTreeMapConfig config, PrimitiveManagementService managementService) {
     super(AtomicTreeMapType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/value/AtomicValueBuilder.java b/core/src/main/java/io/atomix/core/value/AtomicValueBuilder.java
index 73606a5a09..85cc69f820 100644
--- a/core/src/main/java/io/atomix/core/value/AtomicValueBuilder.java
+++ b/core/src/main/java/io/atomix/core/value/AtomicValueBuilder.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.core.value;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
@@ -24,7 +24,7 @@
  * @param <V> atomic value type
  */
 public abstract class AtomicValueBuilder<V>
-    extends DistributedPrimitiveBuilder<AtomicValueBuilder<V>, AtomicValueConfig, AtomicValue<V>> {
+    extends PrimitiveBuilder<AtomicValueBuilder<V>, AtomicValueConfig, AtomicValue<V>> {
   public AtomicValueBuilder(String name, AtomicValueConfig config, PrimitiveManagementService managementService) {
     super(AtomicValueType.instance(), name, config, managementService);
   }
diff --git a/core/src/main/java/io/atomix/core/workqueue/WorkQueueBuilder.java b/core/src/main/java/io/atomix/core/workqueue/WorkQueueBuilder.java
index 128aeba20d..35c8aca2e1 100644
--- a/core/src/main/java/io/atomix/core/workqueue/WorkQueueBuilder.java
+++ b/core/src/main/java/io/atomix/core/workqueue/WorkQueueBuilder.java
@@ -15,13 +15,13 @@
  */
 package io.atomix.core.workqueue;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 
 /**
  * Work queue builder.
  */
-public abstract class WorkQueueBuilder<E> extends DistributedPrimitiveBuilder<WorkQueueBuilder<E>, WorkQueueConfig, WorkQueue<E>> {
+public abstract class WorkQueueBuilder<E> extends PrimitiveBuilder<WorkQueueBuilder<E>, WorkQueueConfig, WorkQueue<E>> {
   public WorkQueueBuilder(String name, WorkQueueConfig config, PrimitiveManagementService managementService) {
     super(WorkQueueType.instance(), name, config, managementService);
   }
diff --git a/primitive/src/main/java/io/atomix/primitive/DistributedPrimitiveBuilder.java b/primitive/src/main/java/io/atomix/primitive/PrimitiveBuilder.java
similarity index 95%
rename from primitive/src/main/java/io/atomix/primitive/DistributedPrimitiveBuilder.java
rename to primitive/src/main/java/io/atomix/primitive/PrimitiveBuilder.java
index c824d8811e..1efabae5e3 100644
--- a/primitive/src/main/java/io/atomix/primitive/DistributedPrimitiveBuilder.java
+++ b/primitive/src/main/java/io/atomix/primitive/PrimitiveBuilder.java
@@ -39,7 +39,7 @@
  * @param <B> builder type
  * @param <P> primitive type
  */
-public abstract class DistributedPrimitiveBuilder<B extends DistributedPrimitiveBuilder<B, C, P>, C extends PrimitiveConfig, P extends DistributedPrimitive> implements Builder<P> {
+public abstract class PrimitiveBuilder<B extends PrimitiveBuilder<B, C, P>, C extends PrimitiveConfig, P extends DistributedPrimitive> implements Builder<P> {
   protected final PrimitiveType type;
   protected final String name;
   protected final C config;
@@ -47,7 +47,7 @@ public abstract class DistributedPrimitiveBuilder<B extends DistributedPrimitive
   protected PrimitiveProtocol protocol;
   protected final PrimitiveManagementService managementService;
 
-  public DistributedPrimitiveBuilder(PrimitiveType type, String name, C config, PrimitiveManagementService managementService) {
+  public PrimitiveBuilder(PrimitiveType type, String name, C config, PrimitiveManagementService managementService) {
     this.type = checkNotNull(type, "type cannot be null");
     this.name = checkNotNull(name, "name cannot be null");
     this.config = checkNotNull(config, "config cannot be null");
diff --git a/primitive/src/main/java/io/atomix/primitive/PrimitiveType.java b/primitive/src/main/java/io/atomix/primitive/PrimitiveType.java
index 08c6c7e761..56173d6757 100644
--- a/primitive/src/main/java/io/atomix/primitive/PrimitiveType.java
+++ b/primitive/src/main/java/io/atomix/primitive/PrimitiveType.java
@@ -26,7 +26,7 @@
 /**
  * Primitive type.
  */
-public interface PrimitiveType<B extends DistributedPrimitiveBuilder, C extends PrimitiveConfig, P extends DistributedPrimitive> extends ConfiguredType<C> {
+public interface PrimitiveType<B extends PrimitiveBuilder, C extends PrimitiveConfig, P extends DistributedPrimitive> extends ConfiguredType<C> {
 
   /**
    * Returns the primitive type namespace.
diff --git a/primitive/src/main/java/io/atomix/primitive/partition/impl/PrimaryElectorType.java b/primitive/src/main/java/io/atomix/primitive/partition/impl/PrimaryElectorType.java
index 24a0422593..4ffa61e6ef 100644
--- a/primitive/src/main/java/io/atomix/primitive/partition/impl/PrimaryElectorType.java
+++ b/primitive/src/main/java/io/atomix/primitive/partition/impl/PrimaryElectorType.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.primitive.partition.impl;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.config.PrimitiveConfig;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
@@ -56,7 +56,7 @@ public PrimitiveConfig newConfig() {
   }
 
   @Override
-  public DistributedPrimitiveBuilder newBuilder(String name, PrimitiveConfig config, PrimitiveManagementService managementService) {
+  public PrimitiveBuilder newBuilder(String name, PrimitiveConfig config, PrimitiveManagementService managementService) {
     throw new UnsupportedOperationException();
   }
 
diff --git a/primitive/src/main/java/io/atomix/primitive/session/impl/SessionIdGeneratorType.java b/primitive/src/main/java/io/atomix/primitive/session/impl/SessionIdGeneratorType.java
index 34b821fa55..7faf9c6741 100644
--- a/primitive/src/main/java/io/atomix/primitive/session/impl/SessionIdGeneratorType.java
+++ b/primitive/src/main/java/io/atomix/primitive/session/impl/SessionIdGeneratorType.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.primitive.session.impl;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.config.PrimitiveConfig;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
@@ -56,7 +56,7 @@ public PrimitiveConfig newConfig() {
   }
 
   @Override
-  public DistributedPrimitiveBuilder newBuilder(String name, PrimitiveConfig config, PrimitiveManagementService managementService) {
+  public PrimitiveBuilder newBuilder(String name, PrimitiveConfig config, PrimitiveManagementService managementService) {
     throw new UnsupportedOperationException();
   }
 
diff --git a/primitive/src/test/java/io/atomix/primitive/TestPrimitiveType.java b/primitive/src/test/java/io/atomix/primitive/TestPrimitiveType.java
index 8d90584f71..9e8a82819d 100644
--- a/primitive/src/test/java/io/atomix/primitive/TestPrimitiveType.java
+++ b/primitive/src/test/java/io/atomix/primitive/TestPrimitiveType.java
@@ -50,7 +50,7 @@ public PrimitiveConfig newConfig() {
   }
 
   @Override
-  public DistributedPrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
+  public PrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
     throw new UnsupportedOperationException();
   }
 }
\ No newline at end of file
diff --git a/protocols/primary-backup/src/test/java/io/atomix/protocols/backup/PrimaryBackupTest.java b/protocols/primary-backup/src/test/java/io/atomix/protocols/backup/PrimaryBackupTest.java
index 48fb28dc41..e2aa66242e 100644
--- a/protocols/primary-backup/src/test/java/io/atomix/protocols/backup/PrimaryBackupTest.java
+++ b/protocols/primary-backup/src/test/java/io/atomix/protocols/backup/PrimaryBackupTest.java
@@ -17,7 +17,7 @@
 
 import io.atomix.cluster.MemberId;
 import io.atomix.cluster.TestClusterMembershipService;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.Replication;
@@ -503,7 +503,7 @@ public PrimitiveConfig newConfig() {
     }
 
     @Override
-    public DistributedPrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
+    public PrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
       throw new UnsupportedOperationException();
     }
 
diff --git a/protocols/raft/src/test/java/io/atomix/protocols/raft/RaftTest.java b/protocols/raft/src/test/java/io/atomix/protocols/raft/RaftTest.java
index 325f00d39a..8f15d3c31e 100644
--- a/protocols/raft/src/test/java/io/atomix/protocols/raft/RaftTest.java
+++ b/protocols/raft/src/test/java/io/atomix/protocols/raft/RaftTest.java
@@ -20,7 +20,7 @@
 import io.atomix.cluster.MemberId;
 import io.atomix.primitive.AbstractAsyncPrimitive;
 import io.atomix.primitive.AsyncPrimitive;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveInfo;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveRegistry;
@@ -1356,7 +1356,7 @@ public PrimitiveConfig newConfig() {
     }
 
     @Override
-    public DistributedPrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
+    public PrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
       throw new UnsupportedOperationException();
     }
 
diff --git a/protocols/raft/src/test/java/io/atomix/protocols/raft/TestPrimitiveType.java b/protocols/raft/src/test/java/io/atomix/protocols/raft/TestPrimitiveType.java
index 7638729522..b7bc473142 100644
--- a/protocols/raft/src/test/java/io/atomix/protocols/raft/TestPrimitiveType.java
+++ b/protocols/raft/src/test/java/io/atomix/protocols/raft/TestPrimitiveType.java
@@ -15,7 +15,7 @@
  */
 package io.atomix.protocols.raft;
 
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.config.PrimitiveConfig;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
@@ -53,7 +53,7 @@ public PrimitiveConfig newConfig() {
   }
 
   @Override
-  public DistributedPrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
+  public PrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
     throw new UnsupportedOperationException();
   }
 }
\ No newline at end of file
diff --git a/tests/src/main/java/io/atomix/protocols/raft/test/RaftFuzzTest.java b/tests/src/main/java/io/atomix/protocols/raft/test/RaftFuzzTest.java
index 2ca5f301d0..f6803a1eba 100644
--- a/tests/src/main/java/io/atomix/protocols/raft/test/RaftFuzzTest.java
+++ b/tests/src/main/java/io/atomix/protocols/raft/test/RaftFuzzTest.java
@@ -19,7 +19,7 @@
 import io.atomix.cluster.MemberId;
 import io.atomix.cluster.messaging.MessagingService;
 import io.atomix.cluster.messaging.impl.NettyMessagingService;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.config.PrimitiveConfig;
@@ -649,7 +649,7 @@ public PrimitiveConfig newConfig() {
     }
 
     @Override
-    public DistributedPrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
+    public PrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
       throw new UnsupportedOperationException();
     }
 
diff --git a/tests/src/main/java/io/atomix/protocols/raft/test/RaftPerformanceTest.java b/tests/src/main/java/io/atomix/protocols/raft/test/RaftPerformanceTest.java
index 54e8273e97..5d4e4f65c1 100644
--- a/tests/src/main/java/io/atomix/protocols/raft/test/RaftPerformanceTest.java
+++ b/tests/src/main/java/io/atomix/protocols/raft/test/RaftPerformanceTest.java
@@ -29,7 +29,7 @@
 import io.atomix.cluster.messaging.ManagedMessagingService;
 import io.atomix.cluster.messaging.MessagingService;
 import io.atomix.cluster.messaging.impl.NettyMessagingService;
-import io.atomix.primitive.DistributedPrimitiveBuilder;
+import io.atomix.primitive.PrimitiveBuilder;
 import io.atomix.primitive.PrimitiveManagementService;
 import io.atomix.primitive.PrimitiveType;
 import io.atomix.primitive.config.PrimitiveConfig;
@@ -572,7 +572,7 @@ public PrimitiveConfig newConfig() {
     }
 
     @Override
-    public DistributedPrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
+    public PrimitiveBuilder newBuilder(String primitiveName, PrimitiveConfig config, PrimitiveManagementService managementService) {
       throw new UnsupportedOperationException();
     }