updating package structure to match module name

aklivity · jfallows · Jan 25, 2024 · Jan 25, 2024 · Jan 25, 2024 · Jan 25, 2024
commit 93f10a44b7875ffa94116511999728afefc4cae3
diff --git a/cloud/docker-image/src/main/docker/assembly.xml b/cloud/docker-image/src/main/docker/assembly.xml
@@ -31,7 +31,6 @@
         <include>io/aklivity/zilla/exporter-*/**</include>
         <include>io/aklivity/zilla/guard-*/**</include>
         <include>io/aklivity/zilla/metrics-*/**</include>
-        <include>io/aklivity/zilla/types-*/**</include>
         <include>io/aklivity/zilla/model-*/**</include>
         <include>io/aklivity/zilla/vault-*/**</include>
         <include>io/aklivity/zilla/command/**</include>

diff --git a/...ain/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java b/...ain/java/io/aklivity/zilla/runtime/command/generate/internal/airline/ConfigGenerator.java
@@ -29,8 +29,8 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 
 import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
-import io.aklivity.zilla.runtime.types.core.config.IntegerValidatorConfig;
-import io.aklivity.zilla.runtime.types.core.config.StringValidatorConfig;
+import io.aklivity.zilla.runtime.model.core.config.IntegerValidatorConfig;
+import io.aklivity.zilla.runtime.model.core.config.StringValidatorConfig;
 
 public abstract class ConfigGenerator
 {

diff --git a/...ntime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java b/...ntime/command/generate/internal/asyncapi/http/proxy/AsyncApiHttpProxyConfigGenerator.java
@@ -59,7 +59,7 @@
 import io.aklivity.zilla.runtime.engine.config.RouteConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.guard.jwt.config.JwtOptionsConfig;
-import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
+import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig;
 import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;
 
 public class AsyncApiHttpProxyConfigGenerator extends AsyncApiConfigGenerator

diff --git a/...ntime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java b/...ntime/command/generate/internal/asyncapi/mqtt/proxy/AsyncApiMqttProxyConfigGenerator.java
@@ -46,7 +46,7 @@
 import io.aklivity.zilla.runtime.engine.config.ConfigWriter;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfig;
 import io.aklivity.zilla.runtime.engine.config.NamespaceConfigBuilder;
-import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
+import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig;
 import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;
 
 public class AsyncApiMqttProxyConfigGenerator extends AsyncApiConfigGenerator

diff --git a/...runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java b/...runtime/command/generate/internal/openapi/http/proxy/OpenApiHttpProxyConfigGenerator.java
@@ -56,7 +56,7 @@
 import io.aklivity.zilla.runtime.engine.config.RouteConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.ValidatorConfig;
 import io.aklivity.zilla.runtime.guard.jwt.config.JwtOptionsConfig;
-import io.aklivity.zilla.runtime.types.json.config.JsonValidatorConfig;
+import io.aklivity.zilla.runtime.model.json.config.JsonValidatorConfig;
 import io.aklivity.zilla.runtime.vault.filesystem.config.FileSystemOptionsConfig;
 
 public class OpenApiHttpProxyConfigGenerator extends OpenApiConfigGenerator

diff --git a/incubator/command-generate/src/main/moditect/module-info.java b/incubator/command-generate/src/main/moditect/module-info.java
@@ -23,10 +23,10 @@
     requires io.aklivity.zilla.runtime.catalog.inline;
     requires io.aklivity.zilla.runtime.guard.jwt;
     requires io.aklivity.zilla.runtime.vault.filesystem;
-    requires io.aklivity.zilla.runtime.types.avro;
-    requires io.aklivity.zilla.runtime.types.core;
-    requires io.aklivity.zilla.runtime.types.json;
-    requires io.aklivity.zilla.runtime.types.protobuf;
+    requires io.aklivity.zilla.runtime.model.avro;
+    requires io.aklivity.zilla.runtime.model.core;
+    requires io.aklivity.zilla.runtime.model.json;
+    requires io.aklivity.zilla.runtime.model.protobuf;
 
     requires com.fasterxml.jackson.dataformat.yaml;
     requires com.fasterxml.jackson.databind;

diff --git a/incubator/model-avro.spec/pom.xml b/incubator/model-avro.spec/pom.xml
@@ -79,7 +79,7 @@
         <version>${project.version}</version>
         <configuration>
           <scopeNames>core</scopeNames>
-          <packageName>io.aklivity.zilla.specs.types.avro.internal.types</packageName>
+          <packageName>io.aklivity.zilla.specs.model.avro.internal.types</packageName>
         </configuration>
         <executions>
           <execution>
@@ -135,7 +135,7 @@
         <artifactId>jacoco-maven-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>io/aklivity/zilla/specs/types/avro/internal/types/**/*.class</exclude>
+            <exclude>io/aklivity/zilla/specs/model/avro/internal/types/**/*.class</exclude>
           </excludes>
           <rules>
             <rule>

diff --git a/incubator/model-avro.spec/src/main/moditect/module-info.java b/incubator/model-avro.spec/src/main/moditect/module-info.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-open module io.aklivity.zilla.specs.types.avro
+open module io.aklivity.zilla.specs.model.avro
 {
     requires transitive io.aklivity.zilla.specs.engine;
 }
diff --git a/...la/specs/types/avro/config/converter.yaml → ...la/specs/model/avro/config/converter.yaml b/...la/specs/types/avro/config/converter.yaml → ...la/specs/model/avro/config/converter.yaml
diff --git a/.../types/avro/schema/avro.schema.patch.json → .../model/avro/schema/avro.schema.patch.json b/.../types/avro/schema/avro.schema.patch.json → .../model/avro/schema/avro.schema.patch.json
diff --git a/...a/specs/types/avro/config/SchemaTest.java → ...a/specs/model/avro/config/SchemaTest.java b/...a/specs/types/avro/config/SchemaTest.java → ...a/specs/model/avro/config/SchemaTest.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.specs.types.avro.config;
+package io.aklivity.zilla.specs.model.avro.config;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.not;
@@ -31,8 +31,8 @@ public class SchemaTest
     public final ConfigSchemaRule schema = new ConfigSchemaRule()
         .schemaPatch("io/aklivity/zilla/specs/engine/schema/binding/test.schema.patch.json")
         .schemaPatch("io/aklivity/zilla/specs/engine/schema/catalog/test.schema.patch.json")
-        .schemaPatch("io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json")
-        .configurationRoot("io/aklivity/zilla/specs/types/avro/config");
+        .schemaPatch("io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json")
+        .configurationRoot("io/aklivity/zilla/specs/model/avro/config");
 
     @Test
     public void shouldValidateCatalog()

diff --git a/incubator/model-avro/pom.xml b/incubator/model-avro/pom.xml
@@ -83,7 +83,7 @@
         <version>${project.version}</version>
         <configuration>
           <scopeNames>core</scopeNames>
-          <packageName>io.aklivity.zilla.runtime.types.avro.internal.types</packageName>
+          <packageName>io.aklivity.zilla.runtime.model.avro.internal.types</packageName>
         </configuration>
         <executions>
           <execution>
@@ -123,13 +123,13 @@
                   <artifactId>model-avro.spec</artifactId>
                   <fileMappers>
                     <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
-                      <pattern>^\Qio/aklivity/zilla/specs/types/avro/\E</pattern>
-                      <replacement>io/aklivity/zilla/runtime/types/avro/internal/</replacement>
+                      <pattern>^\Qio/aklivity/zilla/specs/model/avro/\E</pattern>
+                      <replacement>io/aklivity/zilla/runtime/model/avro/internal/</replacement>
                     </org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
                   </fileMappers>
                 </artifactItem>
               </artifactItems>
-              <includes>io/aklivity/zilla/specs/types/avro/schema/avro.schema.patch.json</includes>
+              <includes>io/aklivity/zilla/specs/model/avro/schema/avro.schema.patch.json</includes>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
             </configuration>
           </execution>
@@ -153,7 +153,7 @@
               <relocations>
                 <relocation>
                   <pattern>org.apache.avro</pattern>
-                  <shadedPattern>io.aklivity.zilla.runtime.types.avro.internal.avro</shadedPattern>
+                  <shadedPattern>io.aklivity.zilla.runtime.model.avro.internal.avro</shadedPattern>
                 </relocation>
               </relocations>
               <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
@@ -187,7 +187,7 @@
         <artifactId>jacoco-maven-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>io/aklivity/zilla/runtime/types/avro/internal/types/**/*.class</exclude>
+            <exclude>io/aklivity/zilla/runtime/model/avro/internal/types/**/*.class</exclude>
           </excludes>
           <rules>
             <rule>

diff --git a/...ypes/avro/config/AvroConverterConfig.java → ...odel/avro/config/AvroConverterConfig.java b/...ypes/avro/config/AvroConverterConfig.java → ...odel/avro/config/AvroConverterConfig.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.config;
+package io.aklivity.zilla.runtime.model.avro.config;
 
 import java.util.List;
 import java.util.function.Function;

diff --git a/...ro/config/AvroConverterConfigBuilder.java → ...ro/config/AvroConverterConfigBuilder.java b/...ro/config/AvroConverterConfigBuilder.java → ...ro/config/AvroConverterConfigBuilder.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.config;
+package io.aklivity.zilla.runtime.model.avro.config;
 
 import java.util.LinkedList;
 import java.util.List;

diff --git a/...me/types/avro/internal/AvroConverter.java → ...me/model/avro/internal/AvroConverter.java b/...me/types/avro/internal/AvroConverter.java → ...me/model/avro/internal/AvroConverter.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal;
+package io.aklivity.zilla.runtime.model.avro.internal;
 
 import java.net.URL;
 

diff --git a/...s/avro/internal/AvroConverterContext.java → ...l/avro/internal/AvroConverterContext.java b/...s/avro/internal/AvroConverterContext.java → ...l/avro/internal/AvroConverterContext.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal;
+package io.aklivity.zilla.runtime.model.avro.internal;
 
 import java.util.function.LongFunction;
 
@@ -21,7 +21,7 @@
 import io.aklivity.zilla.runtime.engine.config.ConverterConfig;
 import io.aklivity.zilla.runtime.engine.converter.ConverterContext;
 import io.aklivity.zilla.runtime.engine.converter.ConverterHandler;
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig;
 
 public class AvroConverterContext implements ConverterContext
 {

diff --git a/...vro/internal/AvroConverterFactorySpi.java → ...vro/internal/AvroConverterFactorySpi.java b/...vro/internal/AvroConverterFactorySpi.java → ...vro/internal/AvroConverterFactorySpi.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal;
+package io.aklivity.zilla.runtime.model.avro.internal;
 
 import java.net.URL;
 

diff --git a/...s/avro/internal/AvroConverterHandler.java → ...l/avro/internal/AvroConverterHandler.java b/...s/avro/internal/AvroConverterHandler.java → ...l/avro/internal/AvroConverterHandler.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal;
+package io.aklivity.zilla.runtime.model.avro.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -41,7 +41,7 @@
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
 import io.aklivity.zilla.runtime.engine.config.CatalogedConfig;
 import io.aklivity.zilla.runtime.engine.config.SchemaConfig;
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig;
 
 public abstract class AvroConverterHandler
 {

diff --git a/...ro/internal/AvroReadConverterHandler.java → ...ro/internal/AvroReadConverterHandler.java b/...ro/internal/AvroReadConverterHandler.java → ...ro/internal/AvroReadConverterHandler.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal;
+package io.aklivity.zilla.runtime.model.avro.internal;
 
 import static io.aklivity.zilla.runtime.engine.catalog.CatalogHandler.NO_SCHEMA_ID;
 
@@ -30,7 +30,7 @@
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
 import io.aklivity.zilla.runtime.engine.converter.ConverterHandler;
 import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig;
 
 public class AvroReadConverterHandler extends AvroConverterHandler implements ConverterHandler
 {

diff --git a/...o/internal/AvroWriteConverterHandler.java → ...o/internal/AvroWriteConverterHandler.java b/...o/internal/AvroWriteConverterHandler.java → ...o/internal/AvroWriteConverterHandler.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal;
+package io.aklivity.zilla.runtime.model.avro.internal;
 
 import java.io.IOException;
 import java.util.function.LongFunction;
@@ -27,7 +27,7 @@
 import io.aklivity.zilla.runtime.engine.catalog.CatalogHandler;
 import io.aklivity.zilla.runtime.engine.converter.ConverterHandler;
 import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig;
 
 public class AvroWriteConverterHandler extends AvroConverterHandler implements ConverterHandler
 {

diff --git a/...al/config/AvroConverterConfigAdapter.java → ...al/config/AvroConverterConfigAdapter.java b/...al/config/AvroConverterConfigAdapter.java → ...al/config/AvroConverterConfigAdapter.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal.config;
+package io.aklivity.zilla.runtime.model.avro.internal.config;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -30,7 +30,7 @@
 import io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi;
 import io.aklivity.zilla.runtime.engine.config.SchemaConfig;
 import io.aklivity.zilla.runtime.engine.config.SchemaConfigAdapter;
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig;
 
 public final class AvroConverterConfigAdapter implements ConverterConfigAdapterSpi, JsonbAdapter<ConverterConfig, JsonValue>
 {

diff --git a/incubator/model-avro/src/main/moditect/module-info.java b/incubator/model-avro/src/main/moditect/module-info.java
@@ -12,21 +12,21 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-module io.aklivity.zilla.runtime.types.avro
+module io.aklivity.zilla.runtime.model.avro
 {
     requires com.fasterxml.jackson.core;
     requires com.fasterxml.jackson.databind;
     requires org.slf4j;
     requires io.aklivity.zilla.runtime.engine;
 
-    exports io.aklivity.zilla.runtime.types.avro.config;
+    exports io.aklivity.zilla.runtime.model.avro.config;
 
-    uses io.aklivity.zilla.runtime.types.avro.internal.avro.Conversion;
-    uses io.aklivity.zilla.runtime.types.avro.internal.avro.LogicalTypes$LogicalTypeFactory;
+    uses io.aklivity.zilla.runtime.model.avro.internal.avro.Conversion;
+    uses io.aklivity.zilla.runtime.model.avro.internal.avro.LogicalTypes$LogicalTypeFactory;
 
     provides io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi
-        with io.aklivity.zilla.runtime.types.avro.internal.config.AvroConverterConfigAdapter;
+        with io.aklivity.zilla.runtime.model.avro.internal.config.AvroConverterConfigAdapter;
 
     provides io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi
-        with io.aklivity.zilla.runtime.types.avro.internal.AvroConverterFactorySpi;
+        with io.aklivity.zilla.runtime.model.avro.internal.AvroConverterFactorySpi;
 }
diff --git a/...urces/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi b/...urces/META-INF/services/io.aklivity.zilla.runtime.engine.config.ConverterConfigAdapterSpi
@@ -1 +1 @@
-io.aklivity.zilla.runtime.types.avro.internal.config.AvroConverterConfigAdapter
+io.aklivity.zilla.runtime.model.avro.internal.config.AvroConverterConfigAdapter
diff --git a/...esources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi b/...esources/META-INF/services/io.aklivity.zilla.runtime.engine.converter.ConverterFactorySpi
@@ -1 +1 @@
-io.aklivity.zilla.runtime.types.avro.internal.AvroConverterFactorySpi
+io.aklivity.zilla.runtime.model.avro.internal.AvroConverterFactorySpi
diff --git a/...internal/AvroConverterFactorySpiTest.java → ...internal/AvroConverterFactorySpiTest.java b/...internal/AvroConverterFactorySpiTest.java → ...internal/AvroConverterFactorySpiTest.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal;
+package io.aklivity.zilla.runtime.model.avro.internal;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -26,7 +26,7 @@
 import io.aklivity.zilla.runtime.engine.converter.Converter;
 import io.aklivity.zilla.runtime.engine.converter.ConverterContext;
 import io.aklivity.zilla.runtime.engine.converter.ConverterFactory;
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig;
 
 public class AvroConverterFactorySpiTest
 {

diff --git a/...ypes/avro/internal/AvroConverterTest.java → ...odel/avro/internal/AvroConverterTest.java b/...ypes/avro/internal/AvroConverterTest.java → ...odel/avro/internal/AvroConverterTest.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal;
+package io.aklivity.zilla.runtime.model.avro.internal;
 
 import static io.aklivity.zilla.runtime.engine.EngineConfiguration.ENGINE_DIRECTORY;
 import static org.junit.Assert.assertEquals;
@@ -35,7 +35,7 @@
 import io.aklivity.zilla.runtime.engine.converter.function.ValueConsumer;
 import io.aklivity.zilla.runtime.engine.test.internal.catalog.TestCatalog;
 import io.aklivity.zilla.runtime.engine.test.internal.catalog.config.TestCatalogOptionsConfig;
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig;
 
 public class AvroConverterTest
 {

diff --git a/...onfig/AvroConverterConfigAdapterTest.java → ...onfig/AvroConverterConfigAdapterTest.java b/...onfig/AvroConverterConfigAdapterTest.java → ...onfig/AvroConverterConfigAdapterTest.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.aklivity.zilla.runtime.types.avro.internal.config;
+package io.aklivity.zilla.runtime.model.avro.internal.config;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -26,7 +26,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import io.aklivity.zilla.runtime.types.avro.config.AvroConverterConfig;
+import io.aklivity.zilla.runtime.model.avro.config.AvroConverterConfig;
 
 public class AvroConverterConfigAdapterTest
 {

diff --git a/incubator/model-core.spec/pom.xml b/incubator/model-core.spec/pom.xml
@@ -79,7 +79,7 @@
         <version>${project.version}</version>
         <configuration>
           <scopeNames>core</scopeNames>
-          <packageName>io.aklivity.zilla.specs.types.core.internal.types</packageName>
+          <packageName>io.aklivity.zilla.specs.model.core.internal.types</packageName>
         </configuration>
         <executions>
           <execution>
@@ -135,7 +135,7 @@
         <artifactId>jacoco-maven-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>io/aklivity/zilla/specs/types/core/internal/types/**/*.class</exclude>
+            <exclude>io/aklivity/zilla/specs/model/core/internal/types/**/*.class</exclude>
           </excludes>
           <rules>
             <rule>

diff --git a/incubator/model-core.spec/src/main/moditect/module-info.java b/incubator/model-core.spec/src/main/moditect/module-info.java
@@ -12,7 +12,7 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-open module io.aklivity.zilla.specs.types.core
+open module io.aklivity.zilla.specs.model.core
 {
     requires transitive io.aklivity.zilla.specs.engine;
 }
diff --git a/...s/types/core/config/string.converter.yaml → ...s/model/core/config/string.converter.yaml b/...s/types/core/config/string.converter.yaml → ...s/model/core/config/string.converter.yaml
diff --git a/...pes/core/schema/integer.schema.patch.json → ...del/core/schema/integer.schema.patch.json b/...pes/core/schema/integer.schema.patch.json → ...del/core/schema/integer.schema.patch.json
diff --git a/...ypes/core/schema/string.schema.patch.json → ...odel/core/schema/string.schema.patch.json b/...ypes/core/schema/string.schema.patch.json → ...odel/core/schema/string.schema.patch.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		io.aklivity.zilla.runtime.types.avro.internal.config.AvroConverterConfigAdapter
		io.aklivity.zilla.runtime.model.avro.internal.config.AvroConverterConfigAdapter