26 files changed, 53 insertions, 53 deletions
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/MappingContext.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/MappingContext.java
index cff766e2a..5a5ba980c 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/MappingContext.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/MappingContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate;
+package io.fd.honeycomb.translate;
 
 import com.google.common.base.Optional;
 import javax.annotation.Nonnull;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/ModifiableSubtreeManagerRegistryBuilder.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/ModifiableSubtreeManagerRegistryBuilder.java
index 591a9e9bb..4e6b2d805 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/ModifiableSubtreeManagerRegistryBuilder.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/ModifiableSubtreeManagerRegistryBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate;
+package io.fd.honeycomb.translate;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/ModificationCache.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/ModificationCache.java
index cb2d4fde0..dcf97439b 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/ModificationCache.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/ModificationCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate;
+package io.fd.honeycomb.translate;
 
 import com.google.common.collect.Maps;
 import java.util.HashMap;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/ModificationContext.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/ModificationContext.java
index 2c039aba0..049c6c05e 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/ModificationContext.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/ModificationContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate;
+package io.fd.honeycomb.translate;
 
 import javax.annotation.Nonnull;
 
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/SubtreeManager.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/SubtreeManager.java
index 40842763d..1e98582df 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/SubtreeManager.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/SubtreeManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate;
+package io.fd.honeycomb.translate;
 
 import com.google.common.annotations.Beta;
 import javax.annotation.Nonnull;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/SubtreeManagerRegistryBuilder.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/SubtreeManagerRegistryBuilder.java
index 2434deddb..7d4104916 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/SubtreeManagerRegistryBuilder.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/SubtreeManagerRegistryBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate;
+package io.fd.honeycomb.translate;
 
 public interface SubtreeManagerRegistryBuilder<R> {
 
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/TranslationException.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/TranslationException.java
index ee0049977..6037391e2 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/TranslationException.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/TranslationException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate;
+package io.fd.honeycomb.translate;
 
 import com.google.common.annotations.Beta;
 
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/ListReader.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/ListReader.java
index 13a7a55da..3791d8e2a 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/ListReader.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/ListReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.read;
+package io.fd.honeycomb.translate.read;
 
 import com.google.common.annotations.Beta;
 import java.util.Collections;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/ReadContext.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/ReadContext.java
index e3ddd420c..655a5164c 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/ReadContext.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/ReadContext.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.read;
+package io.fd.honeycomb.translate.read;
 
-import io.fd.honeycomb.v3po.translate.ModificationContext;
+import io.fd.honeycomb.translate.ModificationContext;
 
 /**
  * Context providing information about current state of DataTree to readers
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/ReadFailedException.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/ReadFailedException.java
index 51d4fcb5a..fc429b1d0 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/ReadFailedException.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/ReadFailedException.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.read;
+package io.fd.honeycomb.translate.read;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import io.fd.honeycomb.v3po.translate.TranslationException;
+import io.fd.honeycomb.translate.TranslationException;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/Reader.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Reader.java
index d0bf0dea1..177b52415 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/Reader.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Reader.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.read;
+package io.fd.honeycomb.translate.read;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
-import io.fd.honeycomb.v3po.translate.SubtreeManager;
+import io.fd.honeycomb.translate.SubtreeManager;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/ReaderFactory.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/ReaderFactory.java
index 61472f8d2..701a26dd5 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/ReaderFactory.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/ReaderFactory.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.read;
+package io.fd.honeycomb.translate.read;
 
 import com.google.common.annotations.Beta;
-import io.fd.honeycomb.v3po.translate.read.registry.ModifiableReaderRegistryBuilder;
+import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
 import javax.annotation.Nonnull;
 
 /**
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/registry/ModifiableReaderRegistryBuilder.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ModifiableReaderRegistryBuilder.java
index c2eba4f72..10dcd9280 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/registry/ModifiableReaderRegistryBuilder.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ModifiableReaderRegistryBuilder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.read.registry;
+package io.fd.honeycomb.translate.read.registry;
 
 import com.google.common.annotations.Beta;
-import io.fd.honeycomb.v3po.translate.ModifiableSubtreeManagerRegistryBuilder;
-import io.fd.honeycomb.v3po.translate.read.Reader;
+import io.fd.honeycomb.translate.ModifiableSubtreeManagerRegistryBuilder;
+import io.fd.honeycomb.translate.read.Reader;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/registry/ReaderRegistry.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ReaderRegistry.java
index 308ec238d..9a1c99508 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/registry/ReaderRegistry.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ReaderRegistry.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.read.registry;
+package io.fd.honeycomb.translate.read.registry;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
 import com.google.common.collect.Multimap;
-import io.fd.honeycomb.v3po.translate.read.ReadContext;
-import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
+import io.fd.honeycomb.translate.read.ReadContext;
+import io.fd.honeycomb.translate.read.ReadFailedException;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/registry/ReaderRegistryBuilder.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ReaderRegistryBuilder.java
index ff95d6248..3f775f274 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/read/registry/ReaderRegistryBuilder.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/registry/ReaderRegistryBuilder.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.read.registry;
+package io.fd.honeycomb.translate.read.registry;
 
 import com.google.common.annotations.Beta;
-import io.fd.honeycomb.v3po.translate.SubtreeManagerRegistryBuilder;
+import io.fd.honeycomb.translate.SubtreeManagerRegistryBuilder;
 
 /**
  * Builder for reader registries.
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/DataObjectUpdate.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/DataObjectUpdate.java
index 0d891ecba..e76d76fcd 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/DataObjectUpdate.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/DataObjectUpdate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write;
+package io.fd.honeycomb.translate.write;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/ListWriter.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/ListWriter.java
index f29289d2d..ea4ed9c93 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/ListWriter.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/ListWriter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write;
+package io.fd.honeycomb.translate.write;
 
 import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.binding.DataObject;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/WriteContext.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriteContext.java
index 3433b3f34..17aea8d8a 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/WriteContext.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriteContext.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write;
+package io.fd.honeycomb.translate.write;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Optional;
-import io.fd.honeycomb.v3po.translate.ModificationContext;
+import io.fd.honeycomb.translate.ModificationContext;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/WriteFailedException.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriteFailedException.java
index 10a664fcf..8f89d3163 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/WriteFailedException.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriteFailedException.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write;
+package io.fd.honeycomb.translate.write;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import io.fd.honeycomb.v3po.translate.TranslationException;
+import io.fd.honeycomb.translate.TranslationException;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/Writer.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/Writer.java
index 77abe341c..e6538012b 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/Writer.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/Writer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write;
+package io.fd.honeycomb.translate.write;
 
 import com.google.common.annotations.Beta;
-import io.fd.honeycomb.v3po.translate.SubtreeManager;
+import io.fd.honeycomb.translate.SubtreeManager;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.binding.DataObject;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/WriterFactory.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriterFactory.java
index ffc76a0e4..70328c7f5 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/WriterFactory.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/WriterFactory.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write;
+package io.fd.honeycomb.translate.write;
 
 import com.google.common.annotations.Beta;
-import io.fd.honeycomb.v3po.translate.write.registry.ModifiableWriterRegistryBuilder;
+import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
 import javax.annotation.Nonnull;
 
 /**
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/registry/ModifiableWriterRegistryBuilder.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/registry/ModifiableWriterRegistryBuilder.java
index 8670a5059..27761e5b4 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/registry/ModifiableWriterRegistryBuilder.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/registry/ModifiableWriterRegistryBuilder.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write.registry;
+package io.fd.honeycomb.translate.write.registry;
 
 import com.google.common.annotations.Beta;
-import io.fd.honeycomb.v3po.translate.ModifiableSubtreeManagerRegistryBuilder;
-import io.fd.honeycomb.v3po.translate.write.Writer;
+import io.fd.honeycomb.translate.ModifiableSubtreeManagerRegistryBuilder;
+import io.fd.honeycomb.translate.write.Writer;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
 /**
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/registry/WriterRegistry.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/registry/WriterRegistry.java
index 439a85410..2467972da 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/registry/WriterRegistry.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/registry/WriterRegistry.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write.registry;
+package io.fd.honeycomb.translate.write.registry;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -22,10 +22,10 @@ import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
-import io.fd.honeycomb.v3po.translate.TranslationException;
-import io.fd.honeycomb.v3po.translate.write.DataObjectUpdate;
-import io.fd.honeycomb.v3po.translate.write.WriteContext;
-import io.fd.honeycomb.v3po.translate.write.Writer;
+import io.fd.honeycomb.translate.TranslationException;
+import io.fd.honeycomb.translate.write.DataObjectUpdate;
+import io.fd.honeycomb.translate.write.WriteContext;
+import io.fd.honeycomb.translate.write.Writer;
 import java.util.Set;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/registry/WriterRegistryBuilder.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/registry/WriterRegistryBuilder.java
index 3f0289ece..5e3481966 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/v3po/translate/write/registry/WriterRegistryBuilder.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/write/registry/WriterRegistryBuilder.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate.write.registry;
+package io.fd.honeycomb.translate.write.registry;
 
 import com.google.common.annotations.Beta;
-import io.fd.honeycomb.v3po.translate.SubtreeManagerRegistryBuilder;
+import io.fd.honeycomb.translate.SubtreeManagerRegistryBuilder;
 
 /**
  * Builder for writer registries.
diff --git a/infra/translate-api/src/main/yang/translate-api.yang b/infra/translate-api/src/main/yang/translate-api.yang
index 796632dd2..133662289 100644
--- a/infra/translate-api/src/main/yang/translate-api.yang
+++ b/infra/translate-api/src/main/yang/translate-api.yang
@@ -16,37 +16,37 @@ module translate-api {
 
     identity honeycomb-reader-factory {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.read.ReaderFactory;
+        config:java-class io.fd.honeycomb.translate.read.ReaderFactory;
     }
 
     identity honeycomb-reader-registry {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.read.registry.ModifiableReaderRegistryBuilder;
+        config:java-class io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
     }
 
     identity honeycomb-reader-registry-builder {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.read.registry.ReaderRegistryBuilder;
+        config:java-class io.fd.honeycomb.translate.read.registry.ReaderRegistryBuilder;
     }
 
     identity honeycomb-writer-factory {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.write.WriterFactory;
+        config:java-class io.fd.honeycomb.translate.write.WriterFactory;
     }
 
     identity honeycomb-writer-registry {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.write.registry.ModifiableWriterRegistryBuilder;
+        config:java-class io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
     }
 
     identity honeycomb-writer-registry-builder {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.write.registry.WriterRegistryBuilder;
+        config:java-class io.fd.honeycomb.translate.write.registry.WriterRegistryBuilder;
     }
 
     identity honeycomb-mapping-context {
         base "config:service-type";
-        config:java-class io.fd.honeycomb.v3po.translate.MappingContext;
+        config:java-class io.fd.honeycomb.translate.MappingContext;
     }
 
 }
 \ No newline at end of file
diff --git a/infra/translate-api/src/test/java/io/fd/honeycomb/v3po/translate/ReadFailedExceptionTest.java b/infra/translate-api/src/test/java/io/fd/honeycomb/translate/ReadFailedExceptionTest.java
index 71c0afbd3..eb3d746c9 100644
--- a/infra/translate-api/src/test/java/io/fd/honeycomb/v3po/translate/ReadFailedExceptionTest.java
+++ b/infra/translate-api/src/test/java/io/fd/honeycomb/translate/ReadFailedExceptionTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.v3po.translate;
+package io.fd.honeycomb.translate;
 
-import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
+import io.fd.honeycomb.translate.read.ReadFailedException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.binding.DataObject;