diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 965d31c..b221a97 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,7 +15,6 @@
             <option value="$PROJECT_DIR$/annotation-processor" />
             <option value="$PROJECT_DIR$/annotations" />
             <option value="$PROJECT_DIR$/basic" />
-            <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/coding" />
             <option value="$PROJECT_DIR$/coding-jdk8" />
             <option value="$PROJECT_DIR$/examples" />
diff --git a/README.md b/README.md
index c9bbca6..4f1a464 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 fluid-json
 ==========
 
-[![Kotlin](https://img.shields.io/badge/Kotlin-1.3.50-blue.svg)](http://kotlinlang.org)
-[![Bintray](https://img.shields.io/bintray/v/fluidsonic/maven/fluid-json)](https://bintray.com/fluidsonic/maven/fluid-json)
+[![Maven Central](https://img.shields.io/maven-central/v/io.fluidsonic.json/fluid-json?label=Maven%20Central)](https://search.maven.org/artifact/io.fluidsonic.json/fluid-json)
+[![JCenter](https://img.shields.io/bintray/v/fluidsonic/kotlin/json?label=JCenter)](https://bintray.com/fluidsonic/kotlin/json)
+[![Kotlin](https://img.shields.io/badge/Kotlin-1.3.50-blue.svg)](https://github.com/JetBrains/kotlin/releases/v1.3.50)
 [![Build Status](https://travis-ci.org/fluidsonic/fluid-json.svg?branch=master)](https://travis-ci.org/fluidsonic/fluid-json)
 [![#fluid-libraries Slack Channel](https://img.shields.io/badge/slack-%23fluid--libraries-543951.svg)](https://kotlinlang.slack.com/messages/C7UDFSVT2/)
-[![Awesome Kotlin](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin)
 
 A JSON library written in pure Kotlin.
 
@@ -32,21 +32,15 @@ Table of Contents
 Installation
 ------------
 
-All artifacts are [available on Bintray](https://bintray.com/fluidsonic/maven/fluid-json) as `fluid-json-…` in the group `com.github.fluidsonic`.
-
 `build.gradle.kts`:
 ```kotlin
 plugins {
     kotlin("kapt")
 }
 
-repositories {
-    maven("https://dl.bintray.com/fluidsonic/maven/")
-}
-
 dependencies {
-    kapt("com.github.fluidsonic:fluid-json-annotation-processor:0.9.25")
-    implementation("com.github.fluidsonic:fluid-json-coding-jdk8:0.9.25")
+    kapt("io.fluidsonic.json:fluid-json-annotation-processor:1.0.0")
+    implementation("io.fluidsonic.json:fluid-json-coding-jdk8:1.0.0")
 }
 ```
 
@@ -61,15 +55,15 @@ _Preferences > Build, Execution, Deployment > Build Tools > Gradle > Runner > De
 Basic Usage
 -----------
 
-`fluid-json` uses `@JSON`-annotations for automatically generating codec classes at compile-time which are responsible for decoding and encoding from and to
+`fluid-json` uses `@Json`-annotations for automatically generating codec classes at compile-time which are responsible for decoding and encoding from and to
 JSON.  
 You can also [create these codecs on your own](#manual-coding) instead of relying on annotation processing.
 
 
 ```kotlin
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
-@JSON
+@Json
 data class Event(
     val attendees: Collection<Attendee>,
     val description: String,
@@ -79,7 +73,7 @@ data class Event(
     val title: String
 )
 
-@JSON
+@Json
 data class Attendee(
     val emailAddress: String,
     val firstName: String,
@@ -96,7 +90,7 @@ enum class RSVP {
 Then create a parser and a serializer which make use of the generated codecs:
 
 ```kotlin
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 fun main() {
     val data = Event(
@@ -111,15 +105,15 @@ fun main() {
        title = "fluid-json MeetUp"
    )
 
-    val serializer = JSONCodingSerializer.builder()
-        .encodingWith(EventJSONCodec, AttendeeJSONCodec)
+    val serializer = JsonCodingSerializer.builder()
+        .encodingWith(EventJsonCodec, AttendeeJsonCodec)
         .build()
 
     val serialized = serializer.serializeValue(data)
     println("serialized: $serialized")
 
-    val parser = JSONCodingParser.builder()
-        .decodingWith(EventJSONCodec, AttendeeJSONCodec)
+    val parser = JsonCodingParser.builder()
+        .decodingWith(EventJsonCodec, AttendeeJsonCodec)
         .build()
 
     val parsed = parser.parseValueOfType<Event>(serialized)
@@ -143,7 +137,7 @@ Annotation Customization
 In this section are a few examples on how JSON codec generation can be customized.
 
 The full documentation on all annotations and properties controlling the JSON codec generation can be found in the
-[KDoc for `@JSON`](https://github.com/fluidsonic/fluid-json/blob/master/annotations/sources/JSON.kt).
+[KDoc for `@Json`](https://github.com/fluidsonic/fluid-json/blob/master/annotations/sources/Json.kt).
 
 ### Collect all generated codecs in one codec provider
 
@@ -151,12 +145,12 @@ All codecs in your module generated by annotation processing can automatically b
 It also frees
 
 ```kotlin
-@JSON.CodecProvider
-interface MyCodecProvider: JSONCodecProvider<JSONCodingContext>
+@Json.CodecProvider
+interface MyCodecProvider: JsonCodecProvider<JsonCodingContext>
 
 fun main() {
-    val parser = JSONCodingParser.builder()
-        .decodingWith(JSONCodecProvider.generated(MyCodecProvider::class))
+    val parser = JsonCodingParser.builder()
+        .decodingWith(JsonCodecProvider.generated(MyCodecProvider::class))
         .build()
     // …
 }
@@ -165,10 +159,10 @@ fun main() {
 ### Customize the generated codec
 
 ```kotlin
-@JSON(
-    codecName        = "MyCoordinateCodec",            // customize the JSONCodec's name
-    codecPackageName = "some.other.location",          // customize the JSONCodec's package
-    codecVisibility  = JSON.CodecVisibility.publicRequired  // customize the JSONCodec's visibility
+@Json(
+    codecName        = "MyCoordinateCodec",            // customize the JsonCodec's name
+    codecPackageName = "some.other.location",          // customize the JsonCodec's package
+    codecVisibility  = Json.CodecVisibility.publicRequired  // customize the JsonCodec's visibility
 )
 data class GeoCoordinate2(
     val latitude: Double,
@@ -179,8 +173,8 @@ data class GeoCoordinate2(
 ### Customize what constructor is used for decoding
 
 ```kotlin
-@JSON(
-    decoding = JSON.Decoding.annotatedConstructor  // require one constructor to be annotated explicitly
+@Json(
+    decoding = Json.Decoding.annotatedConstructor  // require one constructor to be annotated explicitly
 )
 data class GeoCoordinate3(
     val altitude: Double,
@@ -188,7 +182,7 @@ data class GeoCoordinate3(
     val longitude: Double
 ) {
 
-    @JSON.Constructor
+    @Json.Constructor
     constructor(latitude: Double, longitude: Double) : this(
         altitude = -1.0,
         latitude = latitude,
@@ -203,12 +197,12 @@ data class GeoCoordinate3(
 ### Customize what properties are used for encoding (opt-in)
 
 ```kotlin
-@JSON(
-    encoding = JSON.Encoding.annotatedProperties  // only encode properties annotated explicitly
+@Json(
+    encoding = Json.Encoding.annotatedProperties  // only encode properties annotated explicitly
 )
 data class User(
-    @JSON.Property val id: String,
-    @JSON.Property val name: String,
+    @Json.Property val id: String,
+    @Json.Property val name: String,
     val passwordHash: String
 )
 
@@ -219,11 +213,11 @@ data class User(
 ### Customize what properties are used for encoding (opt-out)
 
 ```kotlin
-@JSON
+@Json
 data class User(
     val id: String,
     val name: String,
-    @JSON.Excluded val passwordHash: String
+    @Json.Excluded val passwordHash: String
 )
 
 // input:  {"id":1,"name":"Some User","passwordHash":"123456"}
@@ -233,13 +227,13 @@ data class User(
 ### Encode extension properties
 
 ```kotlin
-@JSON
+@Json
 data class Person(
     val firstName: String,
     val lastName: String
 )
 
-@JSON.Property
+@Json.Property
 val Person.name get() = "$firstName $lastName"
 
 // input:  {"firstName":"Marc","lastName":"Knaup"}
@@ -251,10 +245,10 @@ val Person.name get() = "$firstName $lastName"
 Some prefer it that way ¯\\\_(ツ)\_/¯.
 
 ```kotlin
-@JSON
+@Json
 data class Person(
-    @JSON.Property("first_name") val firstName: String,
-    @JSON.Property("last_name") val lastName: String
+    @Json.Property("first_name") val firstName: String,
+    @Json.Property("last_name") val lastName: String
 )
 
 // input/input: {"first_name":"John","last_name":"Doe"}
@@ -263,8 +257,8 @@ data class Person(
 ### Inline a single value
 
 ```kotlin
-@JSON(
-    representation = JSON.Representation.singleValue  // no need to wrap in a structured JSON object
+@Json(
+    representation = Json.Representation.singleValue  // no need to wrap in a structured JSON object
 )
 class EmailAddress(val value: String)
 
@@ -275,9 +269,9 @@ class EmailAddress(val value: String)
 ### Prevent encoding completely
 
 ```kotlin
-@JSON(
-    encoding       = JSON.Encoding.none,              // prevent encoding altogether
-    representation = JSON.Representation.singleValue  // no need to wrap in a structured JSON object
+@Json(
+    encoding       = Json.Encoding.none,              // prevent encoding altogether
+    representation = Json.Representation.singleValue  // no need to wrap in a structured JSON object
 )
 class Password(val secret: String)
 
@@ -288,8 +282,8 @@ class Password(val secret: String)
 ### Prevent decoding completely
 
 ```kotlin
-@JSON(
-    decoding = JSON.Decoding.none  // prevent decoding altogether
+@Json(
+    decoding = Json.Decoding.none  // prevent decoding altogether
 )
 class Response<Result>(val result: result)
 
@@ -300,37 +294,37 @@ class Response<Result>(val result: result)
 ### Add properties depending on the context
 
 ```kotlin
-@JSON(
-    decoding = JSON.Decoding.none,                // prevent decoding altogether
-    encoding = JSON.Encoding.annotatedProperties  // only encode properties annotated explicitly
+@Json(
+    decoding = Json.Decoding.none,                // prevent decoding altogether
+    encoding = Json.Encoding.annotatedProperties  // only encode properties annotated explicitly
 )
 data class User(
-    @JSON.Property val id: String,
-    @JSON.Property val name: String,
+    @Json.Property val id: String,
+    @Json.Property val name: String,
     val emailAddress: String
 )
 
 
-@JSON.CustomProperties  // function will be called during encoding
-fun JSONEncoder<MyContext>.writeCustomProperties(value: User) {
+@Json.CustomProperties  // function will be called during encoding
+fun JsonEncoder<MyContext>.writeCustomProperties(value: User) {
     if (context.authenticatedUserId == value.id)
         writeMapElement("emailAddress", value = value.emailAddress)
 }
 
 
-@JSON.CodecProvider
-interface MyCodecProvider: JSONCodecProvider<MyContext>
+@Json.CodecProvider
+interface MyCodecProvider: JsonCodecProvider<MyContext>
 
 
 data class MyContext(
     val authenticatedUserId: String?
-): JSONCodingContext
+): JsonCodingContext
 
 
 fun main() {
-    val serializer = JSONCodingSerializer
+    val serializer = JsonCodingSerializer
         .builder(MyContext(authenticatedUserId = "5678"))
-        .encodingWith(JSONCodecProvider.generated(MyCodecProvider::class))
+        .encodingWith(JsonCodecProvider.generated(MyCodecProvider::class))
         .build()
 
     println(serializer.serializeValue(listOf(
@@ -349,14 +343,14 @@ If a type is not part of your module you can still annotate it indirectly in ord
 Note that this currently does not work correctly if the type has internal properties or an internal primary constructor.
 
 ```kotlin
-@JSON.CodecProvider(
+@Json.CodecProvider(
     externalTypes = [
-        JSON.ExternalType(Triple::class, JSON(
-            codecVisibility = JSON.CodecVisibility.publicRequired
+        Json.ExternalType(Triple::class, Json(
+            codecVisibility = Json.CodecVisibility.publicRequired
         ))
     ]
 )
-interface MyCodecProvider: JSONCodecProvider<JSONCodingContext>
+interface MyCodecProvider: JsonCodecProvider<JsonCodingContext>
 ```
 
 
@@ -379,7 +373,7 @@ classes from and to JSON.
 ### Simple Parsing
 
 ```kotlin
-… = JSONParser.default.parseValue("""{ "hello": "world", "test": 123 }""")
+… = JsonParser.default.parseValue("""{ "hello": "world", "test": 123 }""")
 
 // returns a value like this:
 mapOf(
@@ -396,7 +390,7 @@ You can also accept a `null` value by using `parseValueOrNull` instead.
 ### Simple Serializing
 
 ```kotlin
-JSONSerializer.default.serializeValue(mapOf(
+JsonSerializer.default.serializeValue(mapOf(
     "hello" to "world",
     "test" to 123
 ))
@@ -414,10 +408,10 @@ While the examples above parse and return JSON as `String` you can also use `Rea
 
 ```kotlin
 val reader: Reader = …
-… = JSONParser.default.parseValue(source = reader)
+… = JsonParser.default.parseValue(source = reader)
 
 val writer: Writer = …
-JSONSerializer.default.serializeValue(…, destination = writer)
+JsonSerializer.default.serializeValue(…, destination = writer)
 ```
 
 Full example [for Reader](https://github.com/fluidsonic/fluid-json/blob/master/examples/sources/0011-ParsingFromReader.kt)
@@ -426,11 +420,11 @@ and [for Writer](https://github.com/fluidsonic/fluid-json/blob/master/examples/s
 
 ### Parsing Lists and Maps
 
-You can also parse lists and maps in a type-safe way directly. Should it not be possible to parse the input as the requested Kotlin type a `JSONException` is
+You can also parse lists and maps in a type-safe way directly. Should it not be possible to parse the input as the requested Kotlin type a `JsonException` is
 thrown. Note that this requires the `-coding` library variant.
 
 ```kotlin
-val parser = JSONCodingParser.default
+val parser = JsonCodingParser.default
 
 parser.parseValueOfType<List<*>>(…)              // returns List<*>
 parser.parseValueOfType<List<String?>>(…)        // returns List<String?>
@@ -447,11 +441,11 @@ and [for Maps](https://github.com/fluidsonic/fluid-json/blob/master/examples/sou
 
 ### Streaming Parser
 
-`JSONReader` provides an extensive API for reading JSON values from a `Reader`.
+`JsonReader` provides an extensive API for reading JSON values from a `Reader`.
 
 ```kotlin
 val input = StringReader("""{ "data": [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] }""")
-JSONReader.build(input).use { reader ->
+JsonReader.build(input).use { reader ->
     reader.readFromMapByElementValue { key ->
         println(key)
 
@@ -469,11 +463,11 @@ Full example
 
 ### Streaming Writer
 
-`JSONWriter` provides an extensive API for writing JSON values to a `Writer`.
+`JsonWriter` provides an extensive API for writing JSON values to a `Writer`.
 
 ```kotlin
 val output = StringWriter()
-JSONWriter.build(output).use { writer ->
+JsonWriter.build(output).use { writer ->
     writer.writeIntoMap {
         writeMapElement("data") {
             writeIntoList {
@@ -494,22 +488,22 @@ Full example
 ### Type Encoder Codecs
 
 While many basic Kotlin types like `String`, `List`, `Map` and `Boolean` are serialized automatically to their respective JSON counterparts you can easily add
-support for other types. Just write a codec for the type you'd like to serialize by implementing `JSONEncoderCodec` and pass an instance to the builder of
-either `JSONCodingSerializer` (high-level API) or `JSONEncoder` (streaming API).
+support for other types. Just write a codec for the type you'd like to serialize by implementing `JsonEncoderCodec` and pass an instance to the builder of
+either `JsonCodingSerializer` (high-level API) or `JsonEncoder` (streaming API).
 
-Codecs in turn can write other encodable values and `JSONEncoder` will automatically look up the right codec and use it to serialize these values.
+Codecs in turn can write other encodable values and `JsonEncoder` will automatically look up the right codec and use it to serialize these values.
 
-If your codec encounters an inappropriate value which it cannot encode then it will throw a `JSONException` in order to stop the serialization process.
+If your codec encounters an inappropriate value which it cannot encode then it will throw a `JsonException` in order to stop the serialization process.
 
-Because `JSONEncoderCodec` is simply an interface you can use `AbstractJSONEncoderCodec` as base class for your codec which simplifies implementing that
+Because `JsonEncoderCodec` is simply an interface you can use `AbstractJsonEncoderCodec` as base class for your codec which simplifies implementing that
 interface.
 
 ```kotlin
 data class MyType(…)
 
-object MyTypeCodec : AbstractJSONEncoderCodec<MyType, JSONCodingContext>() {
+object MyTypeCodec : AbstractJsonEncoderCodec<MyType, JsonCodingContext>() {
 
-    override fun JSONEncoder<JSONCodingContext>.encode(value: MyType) {
+    override fun JsonEncoder<JsonCodingContext>.encode(value: MyType) {
         // write JSON for `value` directly using the encoder (the receiver)
     }
 }
@@ -521,28 +515,28 @@ object MyTypeCodec : AbstractJSONEncoderCodec<MyType, JSONCodingContext>() {
 ### Type Decoder Codecs
 
 While all JSON types are parsed automatically using appropriate Kotlin couterparts like `String`, `List`, `Map` and `Boolean` you can easily add support for
-other types. Just write a codec for the type you'd like to parse by implementing `JSONDecoderCodec` and pass an instance to the builder of either
-`JSONCodingParser` (high-level API) or `JSONDecoder` (streaming API).
+other types. Just write a codec for the type you'd like to parse by implementing `JsonDecoderCodec` and pass an instance to the builder of either
+`JsonCodingParser` (high-level API) or `JsonDecoder` (streaming API).
 
-Codecs in turn can read other decodable values and `JSONDecoder` will automatically look up the right codec and use it to parse these values.
+Codecs in turn can read other decodable values and `JsonDecoder` will automatically look up the right codec and use it to parse these values.
 
-If your codec encounters inappropriate JSON data which it cannot decode then it will throw a `JSONException` in order to stop the parsing process.
+If your codec encounters inappropriate JSON data which it cannot decode then it will throw a `JsonException` in order to stop the parsing process.
 
-Because `JSONDecoderCodec` is simply an interface you can use `AbstractJSONDecoderCodec` as base class for your codec which simplifies implementing that
+Because `JsonDecoderCodec` is simply an interface you can use `AbstractJsonDecoderCodec` as base class for your codec which simplifies implementing that
 interface.
 
 ```kotlin
 data class MyType(…)
 
-object MyTypeCodec : AbstractJSONDecoderCodec<MyType, JSONCodingContext>() {
+object MyTypeCodec : AbstractJsonDecoderCodec<MyType, JsonCodingContext>() {
 
-    override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<MyType>): MyType {
+    override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<MyType>): MyType {
         // read JSON using and create an instance of `MyType` using decoder (the receiver)
     }
 }
 ```
 
-A `JSONDecoderCodec` can also decode generic types. The instance passed to `JSONCodingType` contains information about generic arguments expected by the call
+A `JsonDecoderCodec` can also decode generic types. The instance passed to `JsonCodingType` contains information about generic arguments expected by the call
 which caused this codec to be invoked. For `List<Something>` for example a single generic argument of type `Something` would be reported which allows for
 example the list codec to serialize the list value's directly as `Something` using the respective codec.
 
@@ -551,25 +545,25 @@ example the list codec to serialize the list value's directly as `Something` usi
 
 ### Type Codecs
 
-If you want to be able to encode and decode the same type you can implement the interface `JSONCodec` which in turn extends `JSONEncoderCodec` and
-`JSONDecoderCodec`. That way you can reuse the same codec class for both, encoding and decoding.
+If you want to be able to encode and decode the same type you can implement the interface `JsonCodec` which in turn extends `JsonEncoderCodec` and
+`JsonDecoderCodec`. That way you can reuse the same codec class for both, encoding and decoding.
 
-Because `JSONCodec` is simply an interface you can use `AbstractJSONCodec` as base class for your codec which simplifies implementing that interface.
+Because `JsonCodec` is simply an interface you can use `AbstractJsonCodec` as base class for your codec which simplifies implementing that interface.
 
 [Full example](https://github.com/fluidsonic/fluid-json/blob/master/examples/sources/0032-TypeCodecs.kt)
 
 
 ### Coding and Streaming
 
-You can use encoding and decoding codecs not just for high-level encoding and decoding using `JSONCodingSerializer` and `JSONCodingParser` but also for
-streaming-based encoding and decoding using `JSONEncoder` and `JSONDecoder`.
+You can use encoding and decoding codecs not just for high-level encoding and decoding using `JsonCodingSerializer` and `JsonCodingParser` but also for
+streaming-based encoding and decoding using `JsonEncoder` and `JsonDecoder`.
 
 [Full example](https://github.com/fluidsonic/fluid-json/blob/master/examples/sources/0033-CodingAsStream.kt)
 
 
 ### Thread Safety
 
-All implementations of `JSONParser`, `JSONSerializer`, `JSONCodecProvider` as well as all codecs provided by this library are thread-safe and can be used from
+All implementations of `JsonParser`, `JsonSerializer`, `JsonCodecProvider` as well as all codecs provided by this library are thread-safe and can be used from
 multiple threads without synchronization. It's strongly advised, though not required, that custom implementations are also thread-safe by default.
 
 All other classes and interfaces are not thread-safe and must be used with approriate synchronization in place. It's recommended however to simply use a
@@ -581,19 +575,19 @@ Error Handling
 --------------
 
 Errors occuring during I/O operations in the underlying `Reader` or `Writer` cause an `IOException`.  
-Errors occuring due to unsupported or mismatching types, malformed JSON or misused API cause a subclass of `JSONException` being thrown.
+Errors occuring due to unsupported or mismatching types, malformed JSON or misused API cause a subclass of `JsonException` being thrown.
 
 Since in Kotlin every method can throw any kind of exception it's recommended to simply catch `Exception` when encoding or decoding JSON - unless handling
 errors explicitly is not needed in your use-case. This is especially important if you parse JSON data from an unsafe source like a public API.
 
-### Default `JSONException` subclasses
+### Default `JsonException` subclasses
 
 | Exception                     | Usage
 | ----------------------------- | -----
-| `JSONException.Parsing`       | Thrown when a `JSONReader` was used improperly, i.e. it's a development error.
-| `JSONException.Serialization` | Thrown when a `JSONWriter` is used inproperly, e.g. if it would result in malformed JSON.
-| `JSONException.Schema`        | Thrown when a `JSONReader` or `JSONDecoder` reads data in an unexpected format, i.e. them schema of the JSON data is wrong.
-| `JSONException.Syntax`        | Thrown when a `JSONReader` reads data which is not properly formatted JSON.
+| `JsonException.Parsing`       | Thrown when a `JsonReader` was used improperly, i.e. it's a development error.
+| `JsonException.Serialization` | Thrown when a `JsonWriter` was used improperly, e.g. if it would result in malformed JSON.
+| `JsonException.Schema`        | Thrown when a `JsonReader` or `JsonDecoder` reads data in an unexpected format, i.e. them schema of the JSON data is wrong.
+| `JsonException.Syntax`        | Thrown when a `JsonReader` reads data which is not properly formatted JSON.
 
 
 
@@ -605,7 +599,7 @@ You can use this library with [`JsonFeature`](https://ktor.io/clients/http-clien
 `build.gradle.kts`:
 ```kotlin
 dependencies {
-    implementation("com.github.fluidsonic:fluid-json-ktor-client:0.9.25")
+    implementation("io.fluidsonic.json:fluid-json-ktor-client:1.0.0")
 }
 ```
 
@@ -614,11 +608,11 @@ Setting up your `HttpClient`:
 val client = HttpClient(…) {
     install(JsonFeature) {
         serializer = FluidJsonSerializer(
-            parser = JSONCodingParser
+            parser = JsonCodingParser
                 .builder()
                 .decodingWith(…)
                 .build(),
-            serializer = JSONCodingSerializer
+            serializer = JsonCodingSerializer
                 .builder()
                 .encodingWith(…)
                 .build()
@@ -634,12 +628,12 @@ Modules
 
 | Module                            | Usage
 | --------------------------------- | -----
-| `fluid-json-annotation-processor` | `@JSON`-based `JSONCodec` creation using `kapt`
-| `fluid-json-annotations`          | contains `@JSON` annotations
-| `fluid-json-basic`                | low-level API with `JSONReader`/`JSONParser` and `JSONWriter`/`JSONSerializer`
-| `fluid-json-coding`               | `JSONCodec`-based parsing and serialization using `JSONDecoder`/`JSONCodingParser` and `JSONEncoder`/`JSONCodingSerializer`
-| `fluid-json-coding-jdk8`          | additional `JSONCodec`s for commonly used Java 8 types on top of `fluid-json-coding`
-| `fluid-json-ktor-client`          | plugs in `JSONCodingParser`/`JSONCodingSerializer` to `ktor-client` using its `JsonSerializer`
+| `fluid-json-annotation-processor` | `@Json`-based `JsonCodec` creation using `kapt`
+| `fluid-json-annotations`          | contains `@Json` annotations
+| `fluid-json-basic`                | low-level API with `JsonReader`/`JsonParser` and `JsonWriter`/`JsonSerializer`
+| `fluid-json-coding`               | `JsonCodec`-based parsing and serialization using `JsonDecoder`/`JsonCodingParser` and `JsonEncoder`/`JsonCodingSerializer`
+| `fluid-json-coding-jdk8`          | additional `JsonCodec`s for commonly used Java 8 types on top of `fluid-json-coding`
+| `fluid-json-ktor-client`          | plugs in `JsonCodingParser`/`JsonCodingSerializer` to `ktor-client` using its `JsonSerializer`
 
 
 
@@ -666,7 +660,7 @@ Type Mapping
 
 #### Encoding
 
-The default implementations of `JSONWriter` and `JSONSerializer` encode Kotlin types as follows:
+The default implementations of `JsonWriter` and `JsonSerializer` encode Kotlin types as follows:
 
 | Kotlin          | JSON               | Remarks
 | --------------- | ------------------ | -------
@@ -699,7 +693,7 @@ The default implementations of `JSONWriter` and `JSONSerializer` encode Kotlin t
 
 #### Decoding
 
-The default implementations of `JSONReader` and `JSONParser` decode JSON types as follows:
+The default implementations of `JsonReader` and `JsonParser` decode JSON types as follows:
 
 | JSON               | Kotlin           | Remarks
 | ------------------ | ---------------- | -------
@@ -746,72 +740,72 @@ For types in the `java.time` package the `-coding-jdk8` library variant must be
 Architecture
 ------------
 
--   `JSONReader`/`JSONWriter` are at the lowest level and read/write JSON as a stream of `JSONToken`s:
+-   `JsonReader`/`JsonWriter` are at the lowest level and read/write JSON as a stream of `JsonToken`s:
     - part of `-basic` library variant
     - character-level input/output
     - validation of read/written syntax
     - one instance per parsing/serializing (maintains state & holds reference to `Reader`/`Writer`)
--   `JSONParser`/`JSONSerializer` are built on top of `JSONReader`/`JSONWriter` and read/write a complete JSON value at once.
+-   `JsonParser`/`JsonSerializer` are built on top of `JsonReader`/`JsonWriter` and read/write a complete JSON value at once.
     - part of `-basic` library variant
-    - completely hides usage of underlying `JSONReader`/`JSONWriter`
+    - completely hides usage of underlying `JsonReader`/`JsonWriter`
     - encoding is performed using the actual type of values to be encoded
-    - decoding is performed using the type expected by the caller of `JSONParser`'s `parse…` methods and only available for basic types
-    - instance can be reused and creates one `JSONReader`/`JSONWriter` per parsing/serialization invocation
+    - decoding is performed using the type expected by the caller of `JsonParser`'s `parse…` methods and only available for basic types
+    - instance can be reused and creates one `JsonReader`/`JsonWriter` per parsing/serialization invocation
     - ease of use is important
--   `JSONDecoder`/`JSONEncoder` are built on top of `JSONReader`/`JSONWriter` and decode/encode arbitrary Kotlin types from/to a stream of `JSONToken`s:
+-   `JsonDecoder`/`JsonEncoder` are built on top of `JsonReader`/`JsonWriter` and decode/encode arbitrary Kotlin types from/to a stream of `JsonToken`s:
     - part of `-coding` library variant
-    - most read/write operations are forwarded to the underlying `JSONReader`/`JSONWriter`
-    - some read/write operations are intercepted by `JSONEncoder` to encode compatible types using codecs
-    - implementations provided by `JSONDecoderCodec`s and `JSONEncoderCodec`s
+    - most read/write operations are forwarded to the underlying `JsonReader`/`JsonWriter`
+    - some read/write operations are intercepted by `JsonEncoder` to encode compatible types using codecs
+    - implementations provided by `JsonDecoderCodec`s and `JsonEncoderCodec`s
     - inspired by MongoDB's [Codec and CodecRegistry](http://mongodb.github.io/mongo-java-driver/3.9/bson/codecs/)
-    - one instance per parsing/serialization invocation (holds reference to `JSONReader`/`JSONWriter`)
--   `JSONCodingParser`/`JSONCodingSerializer` are built on top of `JSONDecoder`/`JSONEncoder` and read/write a complete JSON value at once.
+    - one instance per parsing/serialization invocation (holds reference to `JsonReader`/`JsonWriter`)
+-   `JsonCodingParser`/`JsonCodingSerializer` are built on top of `JsonDecoder`/`JsonEncoder` and read/write a complete JSON value at once.
     - part of `-coding` library variant
-    - completely hides usage of underlying `JSONDecoder`/`JSONEncoder`
-    - encoding is performed using the actual type of values to be encoded using a matching `JSONEncoderCodec` implementation
-    - decoding is performed using the type expected by the caller of `JSONParser`'s `parse…` methods and a matching `JSONDecoderCodec` implementation
-    - instance can be reused and creates one `JSONDecoder`/`JSONEncoder` per parsing/serialization invocation
+    - completely hides usage of underlying `JsonDecoder`/`JsonEncoder`
+    - encoding is performed using the actual type of values to be encoded using a matching `JsonEncoderCodec` implementation
+    - decoding is performed using the type expected by the caller of `JsonParser`'s `parse…` methods and a matching `JsonDecoderCodec` implementation
+    - instance can be reused and creates one `JsonDecoder`/`JsonEncoder` per parsing/serialization invocation
     - ease of use is important
 
 Most public API is provided as `interface`s in order to allow for plugging in custom behavior and to allow easy unit testing of code which produces or consumes
 JSON.
 
-The default implementations of `JSONDecoder`/`JSONEncoder` use a set of pre-defined codecs in order to support decoding/encoding various basic Kotlin types like
+The default implementations of `JsonDecoder`/`JsonEncoder` use a set of pre-defined codecs in order to support decoding/encoding various basic Kotlin types like
 `String`, `List`, `Map`, `Boolean` and so on. Codecs for classes which are available only since Java 8 are provided by the `-coding-jdk8` library variant.
 
 ### Recursive vs. Non-Recursive
 
 While codec-based decoding/encoding has to be implemented recursively in order to be efficient and easy to use it's sometimes not desirable to parse/serialize
-JSON recursively. For that reason the default container codecs like `MapJSONCodec` also provide a `nonRecursive` codec. Since they read/write a whole value at
-once using `JSONReader`'s/`JSONWriter`'s primitive `read*`/`write*` methods they will not use any other codecs and thus don't support encoding or decoding other
+JSON recursively. For that reason the default container codecs like `MapJsonCodec` also provide a `nonRecursive` codec. Since they read/write a whole value at
+once using `JsonReader`'s/`JsonWriter`'s primitive `read*`/`write*` methods they will not use any other codecs and thus don't support encoding or decoding other
 non-basic types.
 
-`JSONCodingParser.nonRecursive` and `JSONCodingSerializer.nonRecursive` both operate on these codecs and are thus a non-recursive parser/serializer.
+`JsonCodingParser.nonRecursive` and `JsonCodingSerializer.nonRecursive` both operate on these codecs and are thus a non-recursive parser/serializer.
 
 ### Classes and Interfaces
 
 | Type                       | Description
 | -------------------------- | -----------
-| `AbstractJSONCodec`        | Abstract base class which simplifies implementing `JSONCodec`.
-| `AbstractJSONDecoderCodec` | Abstract base class which simplifies implementing `JSONDecoderCodec`.
-| `AbstractJSONEncoderCodec` | Abstract base class which simplifies implementing `JSONEncoderCodec`.
-| `DefaultJSONCodecs`        | Contains lists of default codecs which can be used when contructing custom `JSONCodecProvider`s.
-| `JSONCodec`                | Interface for classes which implement both, `JSONEncoderCodec` and `JSONDecoderCodec`. Also simplifies creating such codecs.
-| `JSONCodecProvider`        | Interface for classes which when given a `JSONCodingType` (for decoding) or `KClass` (for encoding) return a codec which is able to decode/encode values of that type.
-| `JSONCodingContext`        | Interface for context types. Instances of context types can be passed to `JSONParser`, `JSONSerializer`, `JSONDecoder` and `JSONEncoder`. They in turn can be used by custom codecs to help decoding/encoding values if needed.
-| `JSONCodingParser`         | Interface for high-level reusable JSON parsers with codec providers and context already configured.
-| `JSONCodingSerializer`     | Interface for high-level reusable JSON serializers where codec providers and context are already configured.
-| `JSONCodingType`           | Roughly describes a Kotlin type which can be decoded from JSON. It includes relevant generic information which allows decoding for example `List<Something>` instead of just `List<*>`. Also known as [type token](http://gafter.blogspot.de/2006/12/super-type-tokens.html)).
-| `JSONDecoder`              | Interface which extends `JSONReader` to enable reading values of any Kotlin type from JSON using `JSONCodecProvider`s for type mapping.
-| `JSONDecoderCodec`         | Interface for decoding a value of a specific Kotlin type using a `JSONDecoder`.
-| `JSONEncoder`              | Interface which extends `JSONWriter` to enable writing values of any Kotlin type as JSON using `JSONCodecProvider`s for type mapping.
-| `JSONEncoderCodec`         | Interface for encoding a value of a specific Kotlin type using a `JSONEncoder`.
-| `JSONException`            | Exception base class which is thrown whenever JSON cannot be written or read for non-IO reasons (e.g. malformed JSON, wrong state in reader/writer, missing type mapping).
-| `JSONParser`               | Interface for high-level reusable JSON parsers which support only basic types.
-| `JSONReader`               | Interface for low-level JSON parsing on a token-by-token basis.
-| `JSONSerializer`           | Interface for high-level reusable JSON serializers which support only basic types.
-| `JSONToken`                | Enum containing all types of tokens a `JSONReader` can read.
-| `JSONWriter`               | Interface for low-level JSON serialization on a token-by-token basis.
+| `AbstractJsonCodec`        | Abstract base class which simplifies implementing `JsonCodec`.
+| `AbstractJsonDecoderCodec` | Abstract base class which simplifies implementing `JsonDecoderCodec`.
+| `AbstractJsonEncoderCodec` | Abstract base class which simplifies implementing `JsonEncoderCodec`.
+| `DefaultJsonCodecs`        | Contains lists of default codecs which can be used when contructing custom `JsonCodecProvider`s.
+| `JsonCodec`                | Interface for classes which implement both, `JsonEncoderCodec` and `JsonDecoderCodec`. Also simplifies creating such codecs.
+| `JsonCodecProvider`        | Interface for classes which when given a `JsonCodingType` (for decoding) or `KClass` (for encoding) return a codec which is able to decode/encode values of that type.
+| `JsonCodingContext`        | Interface for context types. Instances of context types can be passed to `JsonParser`, `JsonSerializer`, `JsonDecoder` and `JsonEncoder`. They in turn can be used by custom codecs to help decoding/encoding values if needed.
+| `JsonCodingParser`         | Interface for high-level reusable JSON parsers with codec providers and context already configured.
+| `JsonCodingSerializer`     | Interface for high-level reusable JSON serializers where codec providers and context are already configured.
+| `JsonCodingType`           | Roughly describes a Kotlin type which can be decoded from JSON. It includes relevant generic information which allows decoding for example `List<Something>` instead of just `List<*>`. Also known as [type token](http://gafter.blogspot.de/2006/12/super-type-tokens.html)).
+| `JsonDecoder`              | Interface which extends `JsonReader` to enable reading values of any Kotlin type from JSON using `JsonCodecProvider`s for type mapping.
+| `JsonDecoderCodec`         | Interface for decoding a value of a specific Kotlin type using a `JsonDecoder`.
+| `JsonEncoder`              | Interface which extends `JsonWriter` to enable writing values of any Kotlin type as JSON using `JsonCodecProvider`s for type mapping.
+| `JsonEncoderCodec`         | Interface for encoding a value of a specific Kotlin type using a `JsonEncoder`.
+| `JsonException`            | Exception base class which is thrown whenever JSON cannot be written or read for non-IO reasons (e.g. malformed JSON, wrong state in reader/writer, missing type mapping).
+| `JsonParser`               | Interface for high-level reusable JSON parsers which support only basic types.
+| `JsonReader`               | Interface for low-level JSON parsing on a token-by-token basis.
+| `JsonSerializer`           | Interface for high-level reusable JSON serializers which support only basic types.
+| `JsonToken`                | Enum containing all types of tokens a `JsonReader` can read.
+| `JsonWriter`               | Interface for low-level JSON serialization on a token-by-token basis.
 | `*Codec`                   | The various codec classes are concrete codecs for common Kotlin types.
 
 
@@ -832,3 +826,8 @@ License
 -------
 
 Apache 2.0
+
+
+--------------------------
+
+[![Awesome Kotlin](https://kotlin.link/awesome-kotlin.svg)](https://github.com/KotlinBy/awesome-kotlin)
diff --git a/annotation-processor/build.gradle.kts b/annotation-processor/build.gradle.kts
index 3ceb842..a9c7c24 100644
--- a/annotation-processor/build.gradle.kts
+++ b/annotation-processor/build.gradle.kts
@@ -1,13 +1,12 @@
-import com.github.fluidsonic.fluid.library.*
+import io.fluidsonic.gradle.*
 import org.jetbrains.kotlin.gradle.plugin.*
 
 plugins {
 	kotlin("kapt")
 }
 
-fluidJvmLibraryVariant {
+fluidJvmLibraryVariant(JvmTarget.jdk8) {
 	description = "A JSON library written in pure Kotlin (annotation processor)"
-	jdk = JvmTarget.jdk8
 }
 
 dependencies {
@@ -15,8 +14,8 @@ dependencies {
 	implementation(project(":fluid-json-coding"))
 
 	implementation(kotlin("reflect"))
-	implementation(fluid("meta-jvm", "0.9.11"))
-	implementation(fluid("stdlib", "0.9.25")) {
+	implementation(fluid("meta", "0.9.12"))
+	implementation(fluid("stdlib", "0.9.28")) {
 		attributes {
 			attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm)
 			attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, Usage.JAVA_RUNTIME))
@@ -25,20 +24,9 @@ dependencies {
 	}
 	implementation("com.google.auto:auto-common:0.10")
 	implementation("com.google.auto.service:auto-service:1.0-rc6")
-	implementation("com.squareup:kotlinpoet:1.4.0")
+	implementation("com.squareup:kotlinpoet:1.4.1")
 
 	kapt("com.google.auto.service:auto-service:1.0-rc6")
 
-	testImplementation(fluid("compiler", "0.9.6"))
+	testImplementation(fluid("compiler", "0.9.7"))
 }
-
-configurations {
-	all {
-		// https://youtrack.jetbrains.com/issue/KT-31641
-		// https://youtrack.jetbrains.com/issue/KT-33206
-
-		if (name.contains("kapt"))
-			attributes.attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, Usage.JAVA_RUNTIME))
-	}
-}
-
diff --git a/annotation-processor/sources/AnnotationProcessor.kt b/annotation-processor/sources/AnnotationProcessor.kt
index 953fef4..9eeb674 100644
--- a/annotation-processor/sources/AnnotationProcessor.kt
+++ b/annotation-processor/sources/AnnotationProcessor.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import com.google.auto.service.*
 import java.io.*
diff --git a/annotation-processor/sources/collection/CollectionPhase.kt b/annotation-processor/sources/collection/CollectionPhase.kt
index c366744..9289c7b 100644
--- a/annotation-processor/sources/collection/CollectionPhase.kt
+++ b/annotation-processor/sources/collection/CollectionPhase.kt
@@ -1,7 +1,7 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.json.*
-import com.github.fluidsonic.fluid.meta.*
+import io.fluidsonic.json.*
+import io.fluidsonic.meta.*
 import javax.annotation.processing.*
 import javax.lang.model.element.*
 import javax.lang.model.type.*
@@ -15,12 +15,12 @@ internal class CollectionPhase(
 ) {
 
 	val annotationClasses = setOf(
-		JSON::class,
-		JSON.CodecProvider::class,
-		JSON.Constructor::class,
-		JSON.CustomProperties::class,
-		JSON.Excluded::class,
-		JSON.Property::class
+		Json::class,
+		Json.CodecProvider::class,
+		Json.Constructor::class,
+		Json.CustomProperties::class,
+		Json.Excluded::class,
+		Json.Property::class
 	)
 
 
@@ -29,12 +29,12 @@ internal class CollectionPhase(
 
 
 	fun collect(roundEnvironment: RoundEnvironment) {
-		collect(JSON::class, roundEnvironment = roundEnvironment, collector = this::collect)
-		collect(JSON.CodecProvider::class, roundEnvironment = roundEnvironment, collector = this::collect)
-		collect(JSON.Constructor::class, roundEnvironment = roundEnvironment, collector = this::collect)
-		collect(JSON.CustomProperties::class, roundEnvironment = roundEnvironment, collector = this::collect)
-		collect(JSON.Excluded::class, roundEnvironment = roundEnvironment, collector = this::collect)
-		collect(JSON.Property::class, roundEnvironment = roundEnvironment, collector = this::collect)
+		collect(Json::class, roundEnvironment = roundEnvironment, collector = this::collect)
+		collect(Json.CodecProvider::class, roundEnvironment = roundEnvironment, collector = this::collect)
+		collect(Json.Constructor::class, roundEnvironment = roundEnvironment, collector = this::collect)
+		collect(Json.CustomProperties::class, roundEnvironment = roundEnvironment, collector = this::collect)
+		collect(Json.Excluded::class, roundEnvironment = roundEnvironment, collector = this::collect)
+		collect(Json.Property::class, roundEnvironment = roundEnvironment, collector = this::collect)
 	}
 
 
@@ -53,12 +53,12 @@ internal class CollectionPhase(
 	}
 
 
-	private fun collect(annotation: JSON, roundEnvironment: RoundEnvironment, element: Element) =
+	private fun collect(annotation: Json, roundEnvironment: RoundEnvironment, element: Element) =
 		collect(annotation = annotation, roundEnvironment = roundEnvironment, element = element, preferredCodecPackageName = null)
 
 
 	@Suppress("UNUSED_PARAMETER")
-	private fun collect(annotation: JSON, roundEnvironment: RoundEnvironment, element: Element, preferredCodecPackageName: MPackageName?) {
+	private fun collect(annotation: Json, roundEnvironment: RoundEnvironment, element: Element, preferredCodecPackageName: MPackageName?) {
 		val meta = Meta.of(element)
 			?: fail("must be a Kotlin type")
 
@@ -78,7 +78,7 @@ internal class CollectionPhase(
 
 		when (val visibility = meta.visibility) {
 			MVisibility.INTERNAL ->
-				if (annotation.codecVisibility == JSON.CodecVisibility.publicRequired)
+				if (annotation.codecVisibility == Json.CodecVisibility.publicRequired)
 					fail("must be public if codec is supposed to be public")
 
 			MVisibility.PUBLIC ->
@@ -97,7 +97,7 @@ internal class CollectionPhase(
 
 			when (val visibility = enclosingType.visibility) {
 				MVisibility.INTERNAL -> {
-					if (annotation.codecVisibility == JSON.CodecVisibility.publicRequired)
+					if (annotation.codecVisibility == Json.CodecVisibility.publicRequired)
 						fail("must only be nested in public types if codec is supposed to be public but '$enclosingElement' is $visibility")
 
 					actualVisibility = visibility
@@ -122,7 +122,7 @@ internal class CollectionPhase(
 	}
 
 
-	private fun collect(annotation: JSON.CodecProvider, roundEnvironment: RoundEnvironment, element: Element) {
+	private fun collect(annotation: Json.CodecProvider, roundEnvironment: RoundEnvironment, element: Element) {
 		val interfaceMeta = Meta.of(element)
 			?: fail("must be a Kotlin type")
 
@@ -149,7 +149,7 @@ internal class CollectionPhase(
 		val supertype = (interfaceMeta.supertypes.singleOrNull() as? MTypeReference.Class)
 			?.takeIf { it.name == TypeNames.codecProviderType }
 			?: fail(
-				"must only extend the interface JSONCodecProvider, extends " + interfaceMeta.supertypes
+				"must only extend the interface JsonCodecProvider, extends " + interfaceMeta.supertypes
 					.filterNot { it.name == TypeNames.anyType }
 					.joinToString { it.name?.toString() ?: "?" }
 					.ifEmpty { "none" }
@@ -167,7 +167,7 @@ internal class CollectionPhase(
 		)
 
 		@Suppress("UNCHECKED_CAST")
-		element.getAnnotationMirror(MQualifiedTypeName.of(JSON.CodecProvider::class))
+		element.getAnnotationMirror(MQualifiedTypeName.of(Json.CodecProvider::class))
 			?.getValue<List<AnnotationMirror>>("externalTypes")
 			?.forEachIndexed { index, externalTypeAnnotationMirror ->
 				val externalTypeAnnotation = annotation.externalTypes[index]
@@ -176,13 +176,13 @@ internal class CollectionPhase(
 					?: error("cannot properly parse external type annotation mirror: $externalTypeAnnotationMirror")
 
 				if (externalType !is ReferenceType && externalTypeAnnotation.targetName.isEmpty())
-					error("JSON.ExternalType can only be used for reference types, not for '$externalType' (if you are using an inline class you have to specify 'targetName' too)")
+					error("Json.ExternalType can only be used for reference types, not for '$externalType' (if you are using an inline class you have to specify 'targetName' too)")
 
 				val externalTypeName = externalTypeAnnotation.targetName.ifEmpty { externalType.toString() }
 				val externalTypeElement = typeResolver.resolveType(externalTypeName)
 					?: error("cannot find external type element for '$externalTypeName'")
 
-				withFailureHandling(annotationClass = JSON.ExternalType::class, element = externalTypeElement) {
+				withFailureHandling(annotationClass = Json.ExternalType::class, element = externalTypeElement) {
 					collect(
 						annotation = externalTypeAnnotation.configuration,
 						roundEnvironment = roundEnvironment,
@@ -195,7 +195,7 @@ internal class CollectionPhase(
 
 
 	@Suppress("UNUSED_PARAMETER")
-	private fun collect(annotation: JSON.Constructor, roundEnvironment: RoundEnvironment, element: Element) {
+	private fun collect(annotation: Json.Constructor, roundEnvironment: RoundEnvironment, element: Element) {
 		if (element !is ExecutableElement)
 			fail("cannot be used on that element")
 
@@ -228,7 +228,7 @@ internal class CollectionPhase(
 
 
 	@Suppress("UNUSED_PARAMETER")
-	private fun collect(annotation: JSON.CustomProperties, roundEnvironment: RoundEnvironment, element: Element) {
+	private fun collect(annotation: Json.CustomProperties, roundEnvironment: RoundEnvironment, element: Element) {
 		if (element !is ExecutableElement)
 			fail("cannot be used on that element")
 
@@ -290,7 +290,7 @@ internal class CollectionPhase(
 
 
 	@Suppress("UNUSED_PARAMETER")
-	private fun collect(annotation: JSON.Excluded, roundEnvironment: RoundEnvironment, element: Element) {
+	private fun collect(annotation: Json.Excluded, roundEnvironment: RoundEnvironment, element: Element) {
 		if (element !is ExecutableElement)
 			fail("cannot be used on that element")
 
@@ -309,8 +309,8 @@ internal class CollectionPhase(
 		val jvmMethodSignature = element.jvmMethodSignature
 
 		if (typeMeta is MConstructable && element.simpleName.contentEquals("<init>")) {
-			if (element.getAnnotation(JSON.Constructor::class.java) != null)
-				fail("cannot be used along @JSON.Constructor on the same constructor")
+			if (element.getAnnotation(Json.Constructor::class.java) != null)
+				fail("cannot be used along @Json.Constructor on the same constructor")
 
 			val meta = typeMeta.constructors
 				.firstOrNull { it.jvmSignature.toString() == jvmMethodSignature }
@@ -324,8 +324,8 @@ internal class CollectionPhase(
 				)
 		}
 		else {
-			if (element.getAnnotation(JSON.Property::class.java) != null)
-				fail("cannot be used along @JSON.Property on the same property")
+			if (element.getAnnotation(Json.Property::class.java) != null)
+				fail("cannot be used along @Json.Property on the same property")
 
 			val meta = typeMeta.properties
 				.firstOrNull { it.jvmSyntheticMethodForAnnotationsSignature?.toString() == jvmMethodSignature }
@@ -347,7 +347,7 @@ internal class CollectionPhase(
 	}
 
 
-	private fun collect(annotation: JSON.Property, roundEnvironment: RoundEnvironment, element: Element) {
+	private fun collect(annotation: Json.Property, roundEnvironment: RoundEnvironment, element: Element) {
 		when (element) {
 			is ExecutableElement -> collect(annotation = annotation, roundEnvironment = roundEnvironment, element = element)
 			is VariableElement -> collect(annotation = annotation, roundEnvironment = roundEnvironment, element = element)
@@ -357,7 +357,7 @@ internal class CollectionPhase(
 
 
 	@Suppress("UNUSED_PARAMETER")
-	private fun collect(annotation: JSON.Property, roundEnvironment: RoundEnvironment, element: ExecutableElement) {
+	private fun collect(annotation: Json.Property, roundEnvironment: RoundEnvironment, element: ExecutableElement) {
 		val enclosingElement = element.enclosingElement
 			?: fail("cannot find enclosing element")
 
@@ -415,7 +415,7 @@ internal class CollectionPhase(
 
 
 	@Suppress("UNUSED_PARAMETER")
-	private fun collect(annotation: JSON.Property, roundEnvironment: RoundEnvironment, element: VariableElement) {
+	private fun collect(annotation: Json.Property, roundEnvironment: RoundEnvironment, element: VariableElement) {
 		val functionElement = element.enclosingElement as? ExecutableElement
 			?: fail("cannot find enclosing function element")
 
@@ -470,19 +470,19 @@ internal class CollectionPhase(
 
 	private fun finishType(type: CollectedType): CollectionResult.Type {
 		val typeName = type.name
-		val typeMeta = type.meta ?: fail("using @JSON.* annotations on members of type $typeName isn't allowed unless the type itself is annotated with @JSON")
+		val typeMeta = type.meta ?: fail("using @Json.* annotations on members of type $typeName isn't allowed unless the type itself is annotated with @Json")
 
 		return CollectionResult.Type(
 			actualVisibility = type.actualVisibility
-				?: fail("using @JSON.* annotations on members of type $typeName isn't allowed unless the type itself is annotated with @JSON"),
+				?: fail("using @Json.* annotations on members of type $typeName isn't allowed unless the type itself is annotated with @Json"),
 
 			annotation = type.annotation
-				?: fail("using @JSON.* annotations on members of type $typeName isn't allowed unless the type itself is annotated with @JSON"),
+				?: fail("using @Json.* annotations on members of type $typeName isn't allowed unless the type itself is annotated with @Json"),
 
 			constructor = type.constructors.ifEmpty { null }?.let { constructors ->
 				constructors.singleOrNull().also { singleConstructor ->
 					singleConstructor ?: fail(
-						"annotating multiple constructors on type $typeName with @JSON.Constructor isn't allowed:\n" +
+						"annotating multiple constructors on type $typeName with @Json.Constructor isn't allowed:\n" +
 							constructors.joinToString(separator = "\n") { it.meta.toString() }
 					)
 				}
@@ -490,13 +490,13 @@ internal class CollectionPhase(
 
 			constructorExclusions = type.constructorExclusions.also { exclusions ->
 				if (exclusions.isNotEmpty() && type.constructors.isNotEmpty())
-					fail("using @JSON.Excluded on constructors of type $typeName isn't allowed if explicitly selecting a constructor with @JSON.Constructor")
+					fail("using @Json.Excluded on constructors of type $typeName isn't allowed if explicitly selecting a constructor with @Json.Constructor")
 			},
 
 			customProperties = type.customProperties
 				.mapValues { (_, customProperties) ->
 					if (customProperties.size != 1) {
-						fail("multiple @JSON.CustomProperties-annotated extension functions on type $typeName cannot have the same name:\n" +
+						fail("multiple @Json.CustomProperties-annotated extension functions on type $typeName cannot have the same name:\n" +
 							customProperties.joinToString(separator = "\n") { element ->
 								when (val extensionPackageName = element.extensionPackageName) {
 									null -> "// in $typeName\n${element.functionMeta}"
@@ -513,7 +513,7 @@ internal class CollectionPhase(
 			decodableProperties = type.decodableProperties,
 
 			element = type.element
-				?: fail("using @JSON.* annotations on members of type $typeName isn't allowed unless the type itself is annotated with @JSON"),
+				?: fail("using @Json.* annotations on members of type $typeName isn't allowed unless the type itself is annotated with @Json"),
 
 			meta = typeMeta,
 
@@ -522,7 +522,7 @@ internal class CollectionPhase(
 			properties = type.properties
 				.mapValues { (_, properties) ->
 					if (properties.size != 1) {
-						fail("multiple @JSON.Property-annotated properties of type $typeName cannot have the same name:\n" +
+						fail("multiple @Json.Property-annotated properties of type $typeName cannot have the same name:\n" +
 							properties.joinToString(separator = "\n") { element ->
 								when (val extensionPackageName = element.extensionPackageName) {
 									null -> "// in $typeName\n${element.meta}"
@@ -540,7 +540,7 @@ internal class CollectionPhase(
 									(it.visibility == MVisibility.PUBLIC || it.visibility == MVisibility.INTERNAL)
 							}
 							if (shadowingProperty != null)
-								fail("@JSON.Property-annotated extension property is shadowed by a direct class member:\n" +
+								fail("@Json.Property-annotated extension property is shadowed by a direct class member:\n" +
 									"// in package ${property.extensionPackageName}\n${property.meta}\n" +
 									"// in $typeName\n$shadowingProperty")
 						}
@@ -571,7 +571,7 @@ internal class CollectionPhase(
 	) {
 
 		var actualVisibility: MVisibility? = null
-		var annotation: JSON? = null
+		var annotation: Json? = null
 		val constructors: MutableCollection<CollectionResult.Constructor> = mutableListOf()
 		val constructorExclusions: MutableMap<MLocalId.Constructor, CollectionResult.ConstructorExclusion> = mutableMapOf()
 		val customProperties: MutableMap<Pair<MFunctionName, Boolean>, MutableCollection<CollectionResult.CustomProperties>> = mutableMapOf()
diff --git a/annotation-processor/sources/collection/CollectionResult.kt b/annotation-processor/sources/collection/CollectionResult.kt
index 83e7725..87ac41c 100644
--- a/annotation-processor/sources/collection/CollectionResult.kt
+++ b/annotation-processor/sources/collection/CollectionResult.kt
@@ -1,7 +1,7 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.json.*
-import com.github.fluidsonic.fluid.meta.*
+import io.fluidsonic.json.*
+import io.fluidsonic.meta.*
 import javax.lang.model.element.*
 
 
@@ -11,7 +11,7 @@ internal data class CollectionResult(
 ) {
 
 	data class CodecProvider(
-		val annotation: JSON.CodecProvider,
+		val annotation: Json.CodecProvider,
 		val contextType: MTypeReference,
 		val element: TypeElement,
 		val interfaceMeta: MInterface,
@@ -21,21 +21,21 @@ internal data class CollectionResult(
 
 
 	data class Constructor(
-		val annotation: JSON.Constructor,
+		val annotation: Json.Constructor,
 		val element: ExecutableElement,
 		val meta: MConstructor
 	)
 
 
 	data class ConstructorExclusion(
-		val annotation: JSON.Excluded,
+		val annotation: Json.Excluded,
 		val meta: MConstructor,
 		val element: ExecutableElement
 	)
 
 
 	data class CustomProperties(
-		val annotation: JSON.CustomProperties,
+		val annotation: Json.CustomProperties,
 		val element: ExecutableElement,
 		val extensionPackageName: MPackageName?,
 		val functionMeta: MFunction
@@ -43,14 +43,14 @@ internal data class CollectionResult(
 
 
 	data class DecodableProperty(
-		val annotation: JSON.Property,
+		val annotation: Json.Property,
 		val element: VariableElement,
 		val meta: MValueParameter
 	)
 
 
 	data class Property(
-		val annotation: JSON.Property,
+		val annotation: Json.Property,
 		val element: ExecutableElement,
 		val extensionPackageName: MPackageName?,
 		val meta: MProperty
@@ -58,7 +58,7 @@ internal data class CollectionResult(
 
 
 	data class PropertyExclusion(
-		val annotation: JSON.Excluded,
+		val annotation: Json.Excluded,
 		val meta: MProperty,
 		val element: ExecutableElement
 	)
@@ -66,7 +66,7 @@ internal data class CollectionResult(
 
 	data class Type(
 		val actualVisibility: MVisibility,
-		val annotation: JSON,
+		val annotation: Json,
 		val constructor: Constructor?,
 		val constructorExclusions: Map<MLocalId.Constructor, ConstructorExclusion>,
 		val customProperties: Collection<CustomProperties>,
diff --git a/annotation-processor/sources/generation/CodecGenerator.kt b/annotation-processor/sources/generation/CodecGenerator.kt
index 461094c..da9571c 100644
--- a/annotation-processor/sources/generation/CodecGenerator.kt
+++ b/annotation-processor/sources/generation/CodecGenerator.kt
@@ -1,10 +1,10 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.json.*
-import com.github.fluidsonic.fluid.json.annotationprocessor.ProcessingResult.Codec.*
-import com.github.fluidsonic.fluid.meta.*
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import io.fluidsonic.json.*
+import io.fluidsonic.json.annotationprocessor.ProcessingResult.Codec.*
+import io.fluidsonic.meta.*
 import java.io.*
 import kotlin.reflect.*
 
@@ -27,14 +27,14 @@ internal class CodecGenerator(
 		val decodableProperty = codec.decodingStrategy?.properties?.singleOrNull()
 		val encodableProperty = codec.encodingStrategy?.properties?.singleOrNull()
 
-		val decoderType = JSONDecoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
-		val encoderType = JSONEncoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
+		val decoderType = JsonDecoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
+		val encoderType = JsonEncoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
 
 		FileSpec.builder(codec.name.packageName.kotlin, typeName)
 			.indent("\t")
 			.apply {
 				if (decodableProperty != null) {
-					addImport("com.github.fluidsonic.fluid.json",
+					addImport("io.fluidsonic.json",
 						"readBooleanOrNull",
 						"readByteOrNull",
 						"readCharOrNull",
@@ -49,7 +49,7 @@ internal class CodecGenerator(
 					)
 				}
 				if (encodableProperty != null) {
-					addImport("com.github.fluidsonic.fluid.json",
+					addImport("io.fluidsonic.json",
 						"writeValueOrNull"
 					)
 					encodableProperty.importPackageName?.let { addImport(it.kotlin, encodableProperty.name.kotlin) }
@@ -59,9 +59,9 @@ internal class CodecGenerator(
 				.applyIf(!codec.isPublic) { addModifiers(KModifier.INTERNAL) }
 				.superclass(
 					when {
-						decodableProperty == null -> AbstractJSONEncoderCodec::class
-						encodableProperty == null -> AbstractJSONDecoderCodec::class
-						else -> AbstractJSONCodec::class
+						decodableProperty == null -> AbstractJsonEncoderCodec::class
+						encodableProperty == null -> AbstractJsonDecoderCodec::class
+						else -> AbstractJsonCodec::class
 					}.asTypeName().parameterizedBy(codec.valueType, codec.contextType.forKotlinPoet())
 				)
 				.apply {
@@ -132,7 +132,7 @@ internal class CodecGenerator(
 			.indent("\t")
 			.apply {
 				if (codec.decodingStrategy != null) {
-					addImport("com.github.fluidsonic.fluid.json",
+					addImport("io.fluidsonic.json",
 						"missingPropertyError",
 						"readBooleanOrNull",
 						"readByteOrNull",
@@ -151,11 +151,11 @@ internal class CodecGenerator(
 					val usesReflection = codec.decodingStrategy.properties.any { it.defaultValue == DecodableProperty.DefaultValue.defaultArgument }
 					if (usesReflection) {
 						addImport("kotlin.reflect", "KClass")
-						addImport("com.github.fluidsonic.fluid.json", "jvmErasure")
+						addImport("io.fluidsonic.json", "jvmErasure")
 					}
 				}
 				if (codec.encodingStrategy != null) {
-					addImport("com.github.fluidsonic.fluid.json",
+					addImport("io.fluidsonic.json",
 						"writeIntoMap",
 						"writeBooleanOrNull",
 						"writeByteOrNull",
@@ -187,9 +187,9 @@ internal class CodecGenerator(
 				.applyIf(!codec.isPublic) { addModifiers(KModifier.INTERNAL) }
 				.superclass(
 					when {
-						codec.decodingStrategy == null -> AbstractJSONEncoderCodec::class
-						codec.encodingStrategy == null -> AbstractJSONDecoderCodec::class
-						else -> AbstractJSONCodec::class
+						codec.decodingStrategy == null -> AbstractJsonEncoderCodec::class
+						codec.encodingStrategy == null -> AbstractJsonDecoderCodec::class
+						else -> AbstractJsonCodec::class
 					}.asTypeName().parameterizedBy(codec.valueType, codec.contextType.forKotlinPoet())
 				)
 				.apply {
@@ -223,7 +223,7 @@ internal class CodecGenerator(
 		strategy: DecodingStrategy,
 		valueType: TypeName
 	): TypeSpec.Builder {
-		val decoderType = JSONDecoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
+		val decoderType = JsonDecoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
 		val properties = strategy.properties.sortedBy { it.serializedName }
 		val rawValueType = (valueType as? ParameterizedTypeName)?.rawType ?: valueType
 
@@ -361,7 +361,7 @@ internal class CodecGenerator(
 		strategy: DecodingStrategy,
 		valueType: TypeName
 	): TypeSpec.Builder {
-		val decoderType = JSONDecoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
+		val decoderType = JsonDecoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
 		val properties = strategy.properties.sortedBy { it.serializedName }
 
 		return addFunction(FunSpec.builder("decode")
@@ -475,7 +475,7 @@ internal class CodecGenerator(
 		strategy: EncodingStrategy,
 		valueType: TypeName
 	): TypeSpec.Builder {
-		val encoderType = JSONEncoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
+		val encoderType = JsonEncoder::class.asTypeName().parameterizedBy(codec.contextType.forKotlinPoet())
 
 		val customPropertyMethod = strategy.customPropertyMethods.sortedBy { it.second.kotlin }
 		val properties = strategy.properties.sortedBy { it.serializedName }
@@ -554,6 +554,6 @@ internal class CodecGenerator(
 
 	companion object {
 
-		private val codingType = JSONCodingType::class.asTypeName()
+		private val codingType = JsonCodingType::class.asTypeName()
 	}
 }
diff --git a/annotation-processor/sources/generation/CodecProviderGenerator.kt b/annotation-processor/sources/generation/CodecProviderGenerator.kt
index 2f3c497..c5c5052 100644
--- a/annotation-processor/sources/generation/CodecProviderGenerator.kt
+++ b/annotation-processor/sources/generation/CodecProviderGenerator.kt
@@ -1,9 +1,9 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.json.*
-import com.github.fluidsonic.fluid.meta.*
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import io.fluidsonic.json.*
+import io.fluidsonic.meta.*
 import java.io.*
 import kotlin.reflect.*
 
@@ -35,7 +35,7 @@ internal class CodecProviderGenerator(
 				.addSuperinterface(qualifiedTypeName)
 				.addSuperinterface(
 					codecProvider.interfaceType.forKotlinPoet(typeParameters = emptyList()),
-					CodeBlock.of("JSONCodecProvider(${codecNames.sortedBy { it.kotlinInternal }.joinToString()})")
+					CodeBlock.of("JsonCodecProvider(${codecNames.sortedBy { it.kotlinInternal }.joinToString()})")
 				)
 				.build()
 			)
@@ -45,7 +45,7 @@ internal class CodecProviderGenerator(
 					.addMember("%S", "UNUSED_PARAMETER")
 					.build()
 				)
-				.receiver(JSONCodecProvider.Companion::class)
+				.receiver(JsonCodecProvider.Companion::class)
 				.addParameter(name = "interfaceClass", type = KClass::class.asTypeName().parameterizedBy(qualifiedTypeName))
 				.returns(qualifiedTypeName)
 				.addCode("return %T\n", generatedQualifiedTypeName)
diff --git a/annotation-processor/sources/generation/GenerationPhase.kt b/annotation-processor/sources/generation/GenerationPhase.kt
index df2cae7..20e239a 100644
--- a/annotation-processor/sources/generation/GenerationPhase.kt
+++ b/annotation-processor/sources/generation/GenerationPhase.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import java.io.*
 
diff --git a/annotation-processor/sources/processing/ProcessingPhase.kt b/annotation-processor/sources/processing/ProcessingPhase.kt
index d8cd829..95c17de 100644
--- a/annotation-processor/sources/processing/ProcessingPhase.kt
+++ b/annotation-processor/sources/processing/ProcessingPhase.kt
@@ -1,10 +1,10 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.json.*
-import com.github.fluidsonic.fluid.json.annotationprocessor.ProcessingResult.Codec.*
-import com.github.fluidsonic.fluid.meta.*
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import io.fluidsonic.json.*
+import io.fluidsonic.json.annotationprocessor.ProcessingResult.Codec.*
+import io.fluidsonic.meta.*
 import javax.lang.model.element.*
 
 
@@ -83,16 +83,16 @@ internal class ProcessingPhase(
 
 
 		if (type.constructor != null && type.constructorExclusions.containsKey(type.constructor.meta.localId))
-			fail("cannot use @JSON.Constructor and @JSON.Excluded on the same constructor")
+			fail("cannot use @Json.Constructor and @Json.Excluded on the same constructor")
 
 		val strategy = when (type.meta) {
 			is MClass -> when (type.annotation.decoding) {
-				JSON.Decoding.annotatedConstructor ->
+				Json.Decoding.annotatedConstructor ->
 					type.constructor?.meta
 						?.let(::decodingStrategyForConstructor)
-						?: fail("type uses JSON.Decoding.annotatedConstructor but none was annotated with @JSON.Constructor")
+						?: fail("type uses Json.Decoding.annotatedConstructor but none was annotated with @Json.Constructor")
 
-				JSON.Decoding.automatic ->
+				Json.Decoding.automatic ->
 					(type.constructor?.meta
 						?: type.meta.primaryConstructor?.takeIf(MConstructor::isSuitableForAutomaticSelection)
 						?: type.meta.constructors
@@ -100,46 +100,46 @@ internal class ProcessingPhase(
 							.ifEmpty { null }
 							?.let { candidates ->
 								candidates.singleOrNull()
-									?: fail("multiple secondary constructors could be used for decoding so one must be marked explicitly with @JSON.Constructor")
+									?: fail("multiple secondary constructors could be used for decoding so one must be marked explicitly with @Json.Constructor")
 							}
 						)
 						?.let(::decodingStrategyForConstructor)
-						?: fail("cannot find a constructor suitable for decoding so one should be provided or decoding be disabled using JSON.Decoding.none")
+						?: fail("cannot find a constructor suitable for decoding so one should be provided or decoding be disabled using Json.Decoding.none")
 
-				JSON.Decoding.none ->
+				Json.Decoding.none ->
 					null
 
-				JSON.Decoding.primaryConstructor ->
+				Json.Decoding.primaryConstructor ->
 					type.meta.primaryConstructor
 						?.let(::decodingStrategyForConstructor)
-						?: fail("type uses @JSON.Decoding.primaryConstructor but has no primary constructor")
+						?: fail("type uses @Json.Decoding.primaryConstructor but has no primary constructor")
 			}
 
 			is MObject -> when (type.annotation.decoding) {
-				JSON.Decoding.annotatedConstructor ->
-					fail("cannot use JSON.Decoding.annotatedConstructor with objects")
+				Json.Decoding.annotatedConstructor ->
+					fail("cannot use Json.Decoding.annotatedConstructor with objects")
 
-				JSON.Decoding.automatic,
-				JSON.Decoding.none ->
+				Json.Decoding.automatic,
+				Json.Decoding.none ->
 					null
 
-				JSON.Decoding.primaryConstructor ->
-					fail("cannot use JSON.Decoding.primaryConstructor with objects")
+				Json.Decoding.primaryConstructor ->
+					fail("cannot use Json.Decoding.primaryConstructor with objects")
 			}
 
-			else -> fail("cannot use @JSON on this type")
+			else -> fail("cannot use @Json on this type")
 		}
 
 		if (strategy != null) {
 			if (type.constructor != null && type.constructor.meta.localId != strategy.meta.localId)
-				fail("type uses JSON.Decoding.${type.annotation.decoding.name} but annotated a different constructor with @JSON.Constructor")
+				fail("type uses Json.Decoding.${type.annotation.decoding.name} but annotated a different constructor with @Json.Constructor")
 
 			if (type.constructorExclusions.containsKey(strategy.meta.localId))
-				fail("type uses JSON.Decoding.${type.annotation.decoding.name} but selected constructor is annotated with @JSON.Excluded")
+				fail("type uses Json.Decoding.${type.annotation.decoding.name} but selected constructor is annotated with @Json.Excluded")
 		}
 		else {
 			if (type.constructor != null)
-				fail("type is supposed to not be decodable but a constructor was annotated with @JSON.Constructor")
+				fail("type is supposed to not be decodable but a constructor was annotated with @Json.Constructor")
 		}
 
 		return strategy
@@ -195,34 +195,34 @@ internal class ProcessingPhase(
 
 
 		val metaProperties = (type.meta as? MPropertyContainer)?.properties
-			?: fail("cannot use @JSON on this type")
+			?: fail("cannot use @Json on this type")
 
 		val strategy = when (type.annotation.encoding) {
-			JSON.Encoding.allProperties ->
+			Json.Encoding.allProperties ->
 				encodingStrategyForProperties(
 					metaProperties.filter { it.isSuitableForAutomaticSelection(defaultOnly = false) } +
 						type.properties.values.map { it.meta }
 				)
 
-			JSON.Encoding.annotatedProperties ->
+			Json.Encoding.annotatedProperties ->
 				encodingStrategyForProperties(
 					metaProperties.filter { type.decodableProperties.containsKey(it.name) } +
 						type.properties.values.map { it.meta }
 				)
 
-			JSON.Encoding.automatic ->
+			Json.Encoding.automatic ->
 				encodingStrategyForProperties(
 					metaProperties.filter { it.isSuitableForAutomaticSelection(defaultOnly = true) } +
 						type.properties.values.map { it.meta }
 				)
 
-			JSON.Encoding.none ->
+			Json.Encoding.none ->
 				null
 		}
 
 		if (strategy == null) {
 			if (type.customProperties.isNotEmpty())
-				fail("type is supposed to not be encodable but methods have been annotated with @JSON.CustomProperties")
+				fail("type is supposed to not be encodable but methods have been annotated with @Json.CustomProperties")
 
 			val encodableOnlyProperties = when (decodingStrategy) {
 				null -> type.properties.values
@@ -230,7 +230,7 @@ internal class ProcessingPhase(
 					.filterNot { property -> decodingStrategy.properties.any { it.name == property.meta.name } }
 			}
 			if (encodableOnlyProperties.isNotEmpty())
-				fail("type is supposed to not be encodable but properties have been annotated with @JSON.Property")
+				fail("type is supposed to not be encodable but properties have been annotated with @Json.Property")
 		}
 
 		return strategy
@@ -258,7 +258,7 @@ internal class ProcessingPhase(
 	@JvmName("processCodecProviders")
 	private fun process(results: Collection<CollectionResult.CodecProvider>) {
 		for (result in results) {
-			withFailureHandling(annotation = "JSON.CodecProvider", element = result.element) {
+			withFailureHandling(annotation = "Json.CodecProvider", element = result.element) {
 				process(result)
 			}
 		}
@@ -268,7 +268,7 @@ internal class ProcessingPhase(
 	@JvmName("processTypes")
 	private fun process(results: Collection<CollectionResult.Type>) {
 		for (result in results) {
-			withFailureHandling(annotation = "JSON", element = result.element) {
+			withFailureHandling(annotation = "Json", element = result.element) {
 				process(result)
 			}
 		}
@@ -295,7 +295,7 @@ internal class ProcessingPhase(
 
 	private fun process(type: CollectionResult.Type) {
 		val annotation = type.annotation
-		val meta = type.meta as? MNamedType ?: fail("cannot use @JSON on this type")
+		val meta = type.meta as? MNamedType ?: fail("cannot use @Json on this type")
 
 		val decodingStrategy = decodingStrategyForType(type)
 		val encodingStrategy = encodingStrategyForType(type, decodingStrategy = decodingStrategy)
@@ -303,27 +303,27 @@ internal class ProcessingPhase(
 			fail("type is neither decodable nor encodable")
 
 		val isSingleValue = when (annotation.representation) {
-			JSON.Representation.automatic -> meta is MInlineable && meta.isInline
-			JSON.Representation.structured -> false
-			JSON.Representation.singleValue -> true
+			Json.Representation.automatic -> meta is MInlineable && meta.isInline
+			Json.Representation.structured -> false
+			Json.Representation.singleValue -> true
 		}
 		if (isSingleValue) {
 			if (decodingStrategy != null && decodingStrategy.properties.size != 1)
-				fail("class with JSON.Representation.singleValue must have exactly one decodable property")
+				fail("class with Json.Representation.singleValue must have exactly one decodable property")
 
 			if (encodingStrategy != null) {
 				if (encodingStrategy.properties.size != 1)
-					fail("class with JSON.Representation.singleValue must have exactly one encodable property")
+					fail("class with Json.Representation.singleValue must have exactly one encodable property")
 
 				if (encodingStrategy.customPropertyMethods.isNotEmpty())
-					fail("class with JSON.Representation.singleValue cannot use @JSON.CustomProperties")
+					fail("class with Json.Representation.singleValue cannot use @Json.CustomProperties")
 			}
 		}
 
 		val isPublic = when (annotation.codecVisibility) {
-			JSON.CodecVisibility.automatic -> type.actualVisibility == MVisibility.PUBLIC
-			JSON.CodecVisibility.internal -> false
-			JSON.CodecVisibility.publicRequired -> true
+			Json.CodecVisibility.automatic -> type.actualVisibility == MVisibility.PUBLIC
+			Json.CodecVisibility.internal -> false
+			Json.CodecVisibility.publicRequired -> true
 		}
 
 		codecs += ProcessingResult.Codec(
@@ -339,7 +339,7 @@ internal class ProcessingPhase(
 					?: meta.name.packageName.kotlin,
 				typeName = annotation.codecName
 					.takeIf { it != "<automatic>" }
-					?: meta.name.withoutPackage().kotlin.replace('.', '_') + "JSONCodec"
+					?: meta.name.withoutPackage().kotlin.replace('.', '_') + "JsonCodec"
 			),
 			valueType = meta.name.forKotlinPoet().let {
 				if (meta is MGeneralizable && meta.typeParameters.isNotEmpty()) it.parameterizedBy(*Array(meta.typeParameters.size) { STAR })
diff --git a/annotation-processor/sources/processing/ProcessingResult.kt b/annotation-processor/sources/processing/ProcessingResult.kt
index 912557f..8002565 100644
--- a/annotation-processor/sources/processing/ProcessingResult.kt
+++ b/annotation-processor/sources/processing/ProcessingResult.kt
@@ -1,7 +1,7 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.meta.*
 import com.squareup.kotlinpoet.*
+import io.fluidsonic.meta.*
 
 
 internal data class ProcessingResult(
diff --git a/annotation-processor/sources/utility/AnnotatedConstruct.kt b/annotation-processor/sources/utility/AnnotatedConstruct.kt
index cd39eab..2751585 100644
--- a/annotation-processor/sources/utility/AnnotatedConstruct.kt
+++ b/annotation-processor/sources/utility/AnnotatedConstruct.kt
@@ -1,6 +1,6 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.meta.*
+import io.fluidsonic.meta.*
 import javax.lang.model.*
 
 
diff --git a/annotation-processor/sources/utility/AnnotationMirror.kt b/annotation-processor/sources/utility/AnnotationMirror.kt
index 319a899..83a7748 100644
--- a/annotation-processor/sources/utility/AnnotationMirror.kt
+++ b/annotation-processor/sources/utility/AnnotationMirror.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import javax.lang.model.element.*
 
diff --git a/annotation-processor/sources/utility/Any.kt b/annotation-processor/sources/utility/Any.kt
index 4d4baa9..693ff8d 100644
--- a/annotation-processor/sources/utility/Any.kt
+++ b/annotation-processor/sources/utility/Any.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import kotlin.contracts.*
 
diff --git a/annotation-processor/sources/utility/Element.kt b/annotation-processor/sources/utility/Element.kt
index a4d8ee7..dd54f91 100644
--- a/annotation-processor/sources/utility/Element.kt
+++ b/annotation-processor/sources/utility/Element.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import javax.lang.model.element.*
 
diff --git a/annotation-processor/sources/utility/ErrorLogger.kt b/annotation-processor/sources/utility/ErrorLogger.kt
index b1e6ff1..6c2c9c3 100644
--- a/annotation-processor/sources/utility/ErrorLogger.kt
+++ b/annotation-processor/sources/utility/ErrorLogger.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 
 internal interface ErrorLogger {
diff --git a/annotation-processor/sources/utility/ExecutableElement.kt b/annotation-processor/sources/utility/ExecutableElement.kt
index fb4a48d..3eab0f2 100644
--- a/annotation-processor/sources/utility/ExecutableElement.kt
+++ b/annotation-processor/sources/utility/ExecutableElement.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import javax.lang.model.element.*
 
diff --git a/annotation-processor/sources/utility/KotlinpoetTypeNames.kt b/annotation-processor/sources/utility/KotlinpoetTypeNames.kt
index 522cf43..513181c 100644
--- a/annotation-processor/sources/utility/KotlinpoetTypeNames.kt
+++ b/annotation-processor/sources/utility/KotlinpoetTypeNames.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import com.squareup.kotlinpoet.*
 
diff --git a/annotation-processor/sources/utility/MQualifiedTypeName.kt b/annotation-processor/sources/utility/MQualifiedTypeName.kt
index 7ab9e61..5ea1b40 100644
--- a/annotation-processor/sources/utility/MQualifiedTypeName.kt
+++ b/annotation-processor/sources/utility/MQualifiedTypeName.kt
@@ -1,7 +1,7 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.meta.*
 import com.squareup.kotlinpoet.*
+import io.fluidsonic.meta.*
 
 
 internal fun MQualifiedTypeName.forKotlinPoet(nullable: Boolean = false) =
diff --git a/annotation-processor/sources/utility/MTypeReference.kt b/annotation-processor/sources/utility/MTypeReference.kt
index fc0f614..f50282d 100644
--- a/annotation-processor/sources/utility/MTypeReference.kt
+++ b/annotation-processor/sources/utility/MTypeReference.kt
@@ -1,8 +1,8 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.meta.*
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import io.fluidsonic.meta.*
 
 
 internal fun MTypeReference.Class.forKotlinPoet(typeParameters: List<MTypeParameter>): TypeName {
diff --git a/annotation-processor/sources/utility/TypeMirror.kt b/annotation-processor/sources/utility/TypeMirror.kt
index acf8372..4250274 100644
--- a/annotation-processor/sources/utility/TypeMirror.kt
+++ b/annotation-processor/sources/utility/TypeMirror.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import javax.lang.model.element.*
 import javax.lang.model.type.*
diff --git a/annotation-processor/sources/utility/TypeNames.kt b/annotation-processor/sources/utility/TypeNames.kt
index 82d22ad..c4f0d58 100644
--- a/annotation-processor/sources/utility/TypeNames.kt
+++ b/annotation-processor/sources/utility/TypeNames.kt
@@ -1,13 +1,13 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
-import com.github.fluidsonic.fluid.json.*
-import com.github.fluidsonic.fluid.meta.*
+import io.fluidsonic.json.*
+import io.fluidsonic.meta.*
 
 
 internal object TypeNames {
 
 	val anyType = MQualifiedTypeName.of(Any::class)
-	val codecProviderType = MQualifiedTypeName.of(JSONCodecProvider::class)
-	val codingContext = MQualifiedTypeName.of(JSONCodingContext::class)
-	val encoder = MQualifiedTypeName.of(JSONEncoder::class)
+	val codecProviderType = MQualifiedTypeName.of(JsonCodecProvider::class)
+	val codingContext = MQualifiedTypeName.of(JsonCodingContext::class)
+	val encoder = MQualifiedTypeName.of(JsonEncoder::class)
 }
diff --git a/annotation-processor/sources/utility/TypeResolver.kt b/annotation-processor/sources/utility/TypeResolver.kt
index fb2e6d5..d172232 100644
--- a/annotation-processor/sources/utility/TypeResolver.kt
+++ b/annotation-processor/sources/utility/TypeResolver.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json.annotationprocessor
+package io.fluidsonic.json.annotationprocessor
 
 import javax.lang.model.element.*
 
diff --git a/annotation-processor/tests/cases/1/input/codecProvider/CustomContextCodecProvider.kt b/annotation-processor/tests/cases/1/input/codecProvider/CustomContextCodecProvider.kt
index 8d56928..2944fc6 100644
--- a/annotation-processor/tests/cases/1/input/codecProvider/CustomContextCodecProvider.kt
+++ b/annotation-processor/tests/cases/1/input/codecProvider/CustomContextCodecProvider.kt
@@ -1,23 +1,23 @@
 package codecProvider
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON.CodecProvider(
+@Json.CodecProvider(
 	externalTypes = [
-		JSON.ExternalType(KT30280::class, JSON(codecPackageName = "externalType"), targetName = "codecProvider.KT30280"),
-		JSON.ExternalType(KT30280Primitive::class, JSON(codecPackageName = "externalType"), targetName = "codecProvider.KT30280Primitive"),
-		JSON.ExternalType(Pair::class, JSON(
+		Json.ExternalType(KT30280::class, Json(codecPackageName = "externalType"), targetName = "codecProvider.KT30280"),
+		Json.ExternalType(KT30280Primitive::class, Json(codecPackageName = "externalType"), targetName = "codecProvider.KT30280Primitive"),
+		Json.ExternalType(Pair::class, Json(
 			codecName = "ExternalPairCodec",
 			codecPackageName = "externalType",
-			codecVisibility = JSON.CodecVisibility.publicRequired
+			codecVisibility = Json.CodecVisibility.publicRequired
 		))
 	]
 )
-interface CustomContextCodecProvider : JSONCodecProvider<CustomCodingContext>
+interface CustomContextCodecProvider : JsonCodecProvider<CustomCodingContext>
 
 
-interface CustomCodingContext : JSONCodingContext
+interface CustomCodingContext : JsonCodingContext
 
 inline class KT30280(val value: String)
 inline class KT30280Primitive(val value: Double)
diff --git a/annotation-processor/tests/cases/1/input/customProperties/CustomContext.kt b/annotation-processor/tests/cases/1/input/customProperties/CustomContext.kt
index dc6addc..e3d2651 100644
--- a/annotation-processor/tests/cases/1/input/customProperties/CustomContext.kt
+++ b/annotation-processor/tests/cases/1/input/customProperties/CustomContext.kt
@@ -1,16 +1,16 @@
 package customProperties
 
 import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class CustomContext(val value: String) {
 
-	@JSON.CustomProperties
-	internal fun JSONEncoder<CustomCodingContext>.writeCustomProperties1() = Unit
+	@Json.CustomProperties
+	internal fun JsonEncoder<CustomCodingContext>.writeCustomProperties1() = Unit
 }
 
 
-@JSON.CustomProperties
-internal fun JSONEncoder<CustomCodingContext>.writeCustomProperties2(value: CustomContext) = Unit
+@Json.CustomProperties
+internal fun JsonEncoder<CustomCodingContext>.writeCustomProperties2(value: CustomContext) = Unit
diff --git a/annotation-processor/tests/cases/1/input/customProperties/DifferentPackage.kt b/annotation-processor/tests/cases/1/input/customProperties/DifferentPackage.kt
index e02a741..576e2a7 100644
--- a/annotation-processor/tests/cases/1/input/customProperties/DifferentPackage.kt
+++ b/annotation-processor/tests/cases/1/input/customProperties/DifferentPackage.kt
@@ -1,15 +1,15 @@
 package customProperties
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DifferentPackage(val value: String) {
 
-	@JSON.CustomProperties
-	internal fun JSONEncoder<JSONCodingContext>.writeCustomProperties1() = Unit
+	@Json.CustomProperties
+	internal fun JsonEncoder<JsonCodingContext>.writeCustomProperties1() = Unit
 }
 
 
-@JSON.CustomProperties
-internal fun JSONEncoder<JSONCodingContext>.writeCustomProperties2(value: DifferentPackage) = Unit
+@Json.CustomProperties
+internal fun JsonEncoder<JsonCodingContext>.writeCustomProperties2(value: DifferentPackage) = Unit
diff --git a/annotation-processor/tests/cases/1/input/customProperties/DifferentPackageExtensions.kt b/annotation-processor/tests/cases/1/input/customProperties/DifferentPackageExtensions.kt
index 1a7b391..523972f 100644
--- a/annotation-processor/tests/cases/1/input/customProperties/DifferentPackageExtensions.kt
+++ b/annotation-processor/tests/cases/1/input/customProperties/DifferentPackageExtensions.kt
@@ -1,8 +1,8 @@
 package customProperties.differentPackage
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import customProperties.DifferentPackage
 
 
-@JSON.CustomProperties
-internal fun JSONEncoder<JSONCodingContext>.writeCustomProperties3(value: DifferentPackage) = Unit
+@Json.CustomProperties
+internal fun JsonEncoder<JsonCodingContext>.writeCustomProperties3(value: DifferentPackage) = Unit
diff --git a/annotation-processor/tests/cases/1/input/customProperties/SamePackage.kt b/annotation-processor/tests/cases/1/input/customProperties/SamePackage.kt
index c66d28e..f4f9464 100644
--- a/annotation-processor/tests/cases/1/input/customProperties/SamePackage.kt
+++ b/annotation-processor/tests/cases/1/input/customProperties/SamePackage.kt
@@ -1,15 +1,15 @@
 package customProperties
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class SamePackage(val value: String) {
 
-	@JSON.CustomProperties
-	internal fun JSONEncoder<JSONCodingContext>.writeCustomProperties1() = Unit
+	@Json.CustomProperties
+	internal fun JsonEncoder<JsonCodingContext>.writeCustomProperties1() = Unit
 }
 
 
-@JSON.CustomProperties
-internal fun JSONEncoder<JSONCodingContext>.writeCustomProperties2(value: SamePackage) = Unit
+@Json.CustomProperties
+internal fun JsonEncoder<JsonCodingContext>.writeCustomProperties2(value: SamePackage) = Unit
diff --git a/annotation-processor/tests/cases/1/input/json/classes/Class.kt b/annotation-processor/tests/cases/1/input/json/classes/Class.kt
index 4d6c7a6..2281a43 100644
--- a/annotation-processor/tests/cases/1/input/json/classes/Class.kt
+++ b/annotation-processor/tests/cases/1/input/json/classes/Class.kt
@@ -1,7 +1,7 @@
 package json.classes
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class Class(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/classes/DataClass.kt b/annotation-processor/tests/cases/1/input/json/classes/DataClass.kt
index 98050dd..0ebadec 100644
--- a/annotation-processor/tests/cases/1/input/json/classes/DataClass.kt
+++ b/annotation-processor/tests/cases/1/input/json/classes/DataClass.kt
@@ -1,7 +1,7 @@
 package json.classes
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 data class DataClass(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/classes/GenericClass.kt b/annotation-processor/tests/cases/1/input/json/classes/GenericClass.kt
index 1b32993..d25ef80 100644
--- a/annotation-processor/tests/cases/1/input/json/classes/GenericClass.kt
+++ b/annotation-processor/tests/cases/1/input/json/classes/GenericClass.kt
@@ -1,9 +1,9 @@
 package json.classes
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 data class GenericClass<A, B : GenericClass.Bound, C : Any>(
 	val a: A,
 	val b: B,
diff --git a/annotation-processor/tests/cases/1/input/json/classes/InlineClass.kt b/annotation-processor/tests/cases/1/input/json/classes/InlineClass.kt
index 649235c..517099c 100644
--- a/annotation-processor/tests/cases/1/input/json/classes/InlineClass.kt
+++ b/annotation-processor/tests/cases/1/input/json/classes/InlineClass.kt
@@ -1,7 +1,7 @@
 package json.classes
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 inline class InlineClass(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/classes/Object.kt b/annotation-processor/tests/cases/1/input/json/classes/Object.kt
index c56961c..8d25042 100644
--- a/annotation-processor/tests/cases/1/input/json/classes/Object.kt
+++ b/annotation-processor/tests/cases/1/input/json/classes/Object.kt
@@ -1,9 +1,9 @@
 package json.classes
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 object Object {
 
 	val value = ""
diff --git a/annotation-processor/tests/cases/1/input/json/codecName/Automatic.kt b/annotation-processor/tests/cases/1/input/json/codecName/Automatic.kt
index 6d07bfa..609369d 100644
--- a/annotation-processor/tests/cases/1/input/json/codecName/Automatic.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecName/Automatic.kt
@@ -1,9 +1,9 @@
 package json.codecName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	codecName = JSON.automatic
+@Json(
+	codecName = Json.automatic
 )
 class Automatic(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecName/Custom.kt b/annotation-processor/tests/cases/1/input/json/codecName/Custom.kt
index e4f8e49..e185ac3 100644
--- a/annotation-processor/tests/cases/1/input/json/codecName/Custom.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecName/Custom.kt
@@ -1,9 +1,9 @@
 package json.codecName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	codecName = "CustomizedJSONCodec"
+@Json(
+	codecName = "CustomizedJsonCodec"
 )
 class Custom(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecName/Default.kt b/annotation-processor/tests/cases/1/input/json/codecName/Default.kt
index 2429cab..738aa51 100644
--- a/annotation-processor/tests/cases/1/input/json/codecName/Default.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecName/Default.kt
@@ -1,7 +1,7 @@
 package json.codecName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class Default(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecPackageName/Automatic.kt b/annotation-processor/tests/cases/1/input/json/codecPackageName/Automatic.kt
index b9c79b1..672d672 100644
--- a/annotation-processor/tests/cases/1/input/json/codecPackageName/Automatic.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecPackageName/Automatic.kt
@@ -1,9 +1,9 @@
 package json.codecPackageName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	codecPackageName = JSON.automatic
+@Json(
+	codecPackageName = Json.automatic
 )
 class Automatic(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecPackageName/AutomaticRoot.kt b/annotation-processor/tests/cases/1/input/json/codecPackageName/AutomaticRoot.kt
index 3ac6203..5624cdc 100644
--- a/annotation-processor/tests/cases/1/input/json/codecPackageName/AutomaticRoot.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecPackageName/AutomaticRoot.kt
@@ -1,7 +1,7 @@
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	codecPackageName = JSON.automatic
+@Json(
+	codecPackageName = Json.automatic
 )
 class AutomaticRoot(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecPackageName/Custom.kt b/annotation-processor/tests/cases/1/input/json/codecPackageName/Custom.kt
index 63b356a..3e93629 100644
--- a/annotation-processor/tests/cases/1/input/json/codecPackageName/Custom.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecPackageName/Custom.kt
@@ -1,9 +1,9 @@
 package json.codecPackageName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
+@Json(
 	codecPackageName = "json.codecPackageName.customized"
 )
 class Custom(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecPackageName/CustomRoot.kt b/annotation-processor/tests/cases/1/input/json/codecPackageName/CustomRoot.kt
index 3ff822e..9874e0e 100644
--- a/annotation-processor/tests/cases/1/input/json/codecPackageName/CustomRoot.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecPackageName/CustomRoot.kt
@@ -1,9 +1,9 @@
 package json.codecPackageName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
+@Json(
 	codecPackageName = ""
 )
 class CustomRoot(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecPackageName/Default.kt b/annotation-processor/tests/cases/1/input/json/codecPackageName/Default.kt
index ec17901..8e1e4df 100644
--- a/annotation-processor/tests/cases/1/input/json/codecPackageName/Default.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecPackageName/Default.kt
@@ -1,7 +1,7 @@
 package json.codecPackageName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class Default(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecPackageName/DefaultRoot.kt b/annotation-processor/tests/cases/1/input/json/codecPackageName/DefaultRoot.kt
index a8f1e1c..a1b0b72 100644
--- a/annotation-processor/tests/cases/1/input/json/codecPackageName/DefaultRoot.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecPackageName/DefaultRoot.kt
@@ -1,5 +1,5 @@
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DefaultRoot(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticInternal.kt b/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticInternal.kt
index fe53132..78c55a2 100644
--- a/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticInternal.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticInternal.kt
@@ -1,9 +1,9 @@
 package json.codecVisibility
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	codecVisibility = JSON.CodecVisibility.automatic
+@Json(
+	codecVisibility = Json.CodecVisibility.automatic
 )
 internal class AutomaticInternal(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticInternalForContainedClass.kt b/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticInternalForContainedClass.kt
index 49ba070..3e1f49a 100644
--- a/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticInternalForContainedClass.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticInternalForContainedClass.kt
@@ -1,12 +1,12 @@
 package json.codecVisibility
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 internal class AutomaticInternalForContainedClass {
 
-	@JSON(
-		codecVisibility = JSON.CodecVisibility.automatic
+	@Json(
+		codecVisibility = Json.CodecVisibility.automatic
 	)
 	class ContainedClass(val value: String)
 }
diff --git a/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticPublic.kt b/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticPublic.kt
index cc47ef8..331fdd2 100644
--- a/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticPublic.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecVisibility/AutomaticPublic.kt
@@ -1,9 +1,9 @@
 package json.codecVisibility
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	codecVisibility = JSON.CodecVisibility.automatic
+@Json(
+	codecVisibility = Json.CodecVisibility.automatic
 )
 class AutomaticPublic(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecVisibility/DefaultInternal.kt b/annotation-processor/tests/cases/1/input/json/codecVisibility/DefaultInternal.kt
index d1ddf1c..c34e4ac 100644
--- a/annotation-processor/tests/cases/1/input/json/codecVisibility/DefaultInternal.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecVisibility/DefaultInternal.kt
@@ -1,7 +1,7 @@
 package json.codecVisibility
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DefaultInternal(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecVisibility/Internal.kt b/annotation-processor/tests/cases/1/input/json/codecVisibility/Internal.kt
index e8726fa..edb7409 100644
--- a/annotation-processor/tests/cases/1/input/json/codecVisibility/Internal.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecVisibility/Internal.kt
@@ -1,9 +1,9 @@
 package json.codecVisibility
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	codecVisibility = JSON.CodecVisibility.internal
+@Json(
+	codecVisibility = Json.CodecVisibility.internal
 )
 class Internal(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/codecVisibility/Public.kt b/annotation-processor/tests/cases/1/input/json/codecVisibility/Public.kt
index f38d9f7..a28cbb7 100644
--- a/annotation-processor/tests/cases/1/input/json/codecVisibility/Public.kt
+++ b/annotation-processor/tests/cases/1/input/json/codecVisibility/Public.kt
@@ -1,9 +1,9 @@
 package json.codecVisibility
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	codecVisibility = JSON.CodecVisibility.publicRequired
+@Json(
+	codecVisibility = Json.CodecVisibility.publicRequired
 )
 class Public(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/AnnotatedConstructor.kt b/annotation-processor/tests/cases/1/input/json/decoding/AnnotatedConstructor.kt
index 61ee4f1..be6485e 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/AnnotatedConstructor.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/AnnotatedConstructor.kt
@@ -1,10 +1,10 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.annotatedConstructor
+@Json(
+	decoding = Json.Decoding.annotatedConstructor
 )
 class AnnotatedConstructor(
 	val value: String
@@ -12,6 +12,6 @@ class AnnotatedConstructor(
 
 	constructor(value: Int) : this(value.toString())
 
-	@JSON.Constructor
+	@Json.Constructor
 	constructor(value: Long) : this(value.toString())
 }
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticAnnotatedConstructor.kt b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticAnnotatedConstructor.kt
index 61d1342..67ae344 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticAnnotatedConstructor.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticAnnotatedConstructor.kt
@@ -1,10 +1,10 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.automatic
+@Json(
+	decoding = Json.Decoding.automatic
 )
 class AutomaticAnnotatedConstructor(
 	val value: String
@@ -12,6 +12,6 @@ class AutomaticAnnotatedConstructor(
 
 	constructor(value: Int) : this(value.toString())
 
-	@JSON.Constructor
+	@Json.Constructor
 	constructor(value: Long) : this(value.toString())
 }
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticObject.kt b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticObject.kt
index da3f5a5..e975a5b 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticObject.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticObject.kt
@@ -1,9 +1,9 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.automatic
+@Json(
+	decoding = Json.Decoding.automatic
 )
 object AutomaticObject
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticPrimaryConstructor.kt b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticPrimaryConstructor.kt
index c4dfb41..ef602ad 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticPrimaryConstructor.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticPrimaryConstructor.kt
@@ -1,10 +1,10 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.automatic
+@Json(
+	decoding = Json.Decoding.automatic
 )
 class AutomaticPrimaryConstructor(
 	val value: String
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryExcluded.kt b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryExcluded.kt
index 8983196..43d7b3f 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryExcluded.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryExcluded.kt
@@ -1,12 +1,12 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.automatic
+@Json(
+	decoding = Json.Decoding.automatic
 )
-class AutomaticSecondaryConstructorPrimaryExcluded @JSON.Excluded constructor(
+class AutomaticSecondaryConstructorPrimaryExcluded @Json.Excluded constructor(
 	val value: String
 ) {
 
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessible.kt b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessible.kt
index 8109052..0c0c424 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessible.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessible.kt
@@ -1,10 +1,10 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.automatic
+@Json(
+	decoding = Json.Decoding.automatic
 )
 class AutomaticSecondaryConstructorPrimaryInaccessible private constructor(
 	val value: String
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresent.kt b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresent.kt
index 586de18..a46b6ae 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresent.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresent.kt
@@ -1,10 +1,10 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.automatic
+@Json(
+	decoding = Json.Decoding.automatic
 )
 class AutomaticSecondaryConstructorPrimaryNotPresent {
 
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/ConstructorParameterOrder.kt b/annotation-processor/tests/cases/1/input/json/decoding/ConstructorParameterOrder.kt
index cdf98f9..a74d032 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/ConstructorParameterOrder.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/ConstructorParameterOrder.kt
@@ -1,11 +1,11 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 // check that finding the right constructor using reflection uses the correct order of parameters
-@JSON(
-	encoding = JSON.Encoding.none
+@Json(
+	encoding = Json.Encoding.none
 )
 class ConstructorParameterOrder(
 	val b: String = "b",
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/DefaultAnnotatedConstructor.kt b/annotation-processor/tests/cases/1/input/json/decoding/DefaultAnnotatedConstructor.kt
index 563af79..eba96f4 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/DefaultAnnotatedConstructor.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/DefaultAnnotatedConstructor.kt
@@ -1,15 +1,15 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DefaultAnnotatedConstructor(
 	val value: String
 ) {
 
 	constructor(value: Int) : this(value.toString())
 
-	@JSON.Constructor
+	@Json.Constructor
 	constructor(value: Long) : this(value.toString())
 }
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/DefaultObject.kt b/annotation-processor/tests/cases/1/input/json/decoding/DefaultObject.kt
index 872b147..287b11b 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/DefaultObject.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/DefaultObject.kt
@@ -1,7 +1,7 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 object DefaultObject
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/DefaultPrimaryConstructor.kt b/annotation-processor/tests/cases/1/input/json/decoding/DefaultPrimaryConstructor.kt
index 8d24585..43d74ea 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/DefaultPrimaryConstructor.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/DefaultPrimaryConstructor.kt
@@ -1,9 +1,9 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DefaultPrimaryConstructor(
 	val value: String
 )
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryExcluded.kt b/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryExcluded.kt
index 81c886a..60f832d 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryExcluded.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryExcluded.kt
@@ -1,10 +1,10 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
-class DefaultSecondaryConstructorPrimaryExcluded @JSON.Excluded constructor(
+@Json
+class DefaultSecondaryConstructorPrimaryExcluded @Json.Excluded constructor(
 	val value: String
 ) {
 
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryInaccessible.kt b/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryInaccessible.kt
index acfe16d..0ca4791 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryInaccessible.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryInaccessible.kt
@@ -1,9 +1,9 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DefaultSecondaryConstructorPrimaryInaccessible private constructor(
 	val value: String
 ) {
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryNotPresent.kt b/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryNotPresent.kt
index f739388..a611be8 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryNotPresent.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/DefaultSecondaryConstructorPrimaryNotPresent.kt
@@ -1,9 +1,9 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DefaultSecondaryConstructorPrimaryNotPresent {
 
 	var value = ""
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/None.kt b/annotation-processor/tests/cases/1/input/json/decoding/None.kt
index 6ef2f09..b594c9c 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/None.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/None.kt
@@ -1,10 +1,10 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.none
+@Json(
+	decoding = Json.Decoding.none
 )
 class None(
 	val value: String
diff --git a/annotation-processor/tests/cases/1/input/json/decoding/PrimaryConstructor.kt b/annotation-processor/tests/cases/1/input/json/decoding/PrimaryConstructor.kt
index 27b952a..5680611 100644
--- a/annotation-processor/tests/cases/1/input/json/decoding/PrimaryConstructor.kt
+++ b/annotation-processor/tests/cases/1/input/json/decoding/PrimaryConstructor.kt
@@ -1,10 +1,10 @@
 package json.decoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	decoding = JSON.Decoding.primaryConstructor
+@Json(
+	decoding = Json.Decoding.primaryConstructor
 )
 class PrimaryConstructor(
 	val value: String
diff --git a/annotation-processor/tests/cases/1/input/json/encoding/AllProperties.kt b/annotation-processor/tests/cases/1/input/json/encoding/AllProperties.kt
index 0ccc583..4df2ceb 100644
--- a/annotation-processor/tests/cases/1/input/json/encoding/AllProperties.kt
+++ b/annotation-processor/tests/cases/1/input/json/encoding/AllProperties.kt
@@ -1,11 +1,11 @@
 package json.encoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.Serializable
 
 
-@JSON(
-	encoding = JSON.Encoding.allProperties
+@Json(
+	encoding = Json.Encoding.allProperties
 )
 class AllProperties(
 	val value1: String
@@ -13,7 +13,7 @@ class AllProperties(
 
 	val value2 = ""
 
-	@JSON.Excluded
+	@Json.Excluded
 	val value3 = ""
 
 	private val value4 = ""
@@ -21,7 +21,7 @@ class AllProperties(
 	val value5
 		get() = ""
 
-	@JSON.Property
+	@Json.Property
 	val value6
 		get() = ""
 
@@ -32,6 +32,6 @@ class AllProperties(
 val AllProperties.value8
 	get() = ""
 
-@JSON.Property
+@Json.Property
 val AllProperties.value9
 	get() = ""
diff --git a/annotation-processor/tests/cases/1/input/json/encoding/AnnotatedProperties.kt b/annotation-processor/tests/cases/1/input/json/encoding/AnnotatedProperties.kt
index ed70a46..9e66ab9 100644
--- a/annotation-processor/tests/cases/1/input/json/encoding/AnnotatedProperties.kt
+++ b/annotation-processor/tests/cases/1/input/json/encoding/AnnotatedProperties.kt
@@ -1,11 +1,11 @@
 package json.encoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.Serializable
 
 
-@JSON(
-	encoding = JSON.Encoding.annotatedProperties
+@Json(
+	encoding = Json.Encoding.annotatedProperties
 )
 class AnnotatedProperties(
 	val value1: String
@@ -13,7 +13,7 @@ class AnnotatedProperties(
 
 	val value2 = ""
 
-	@JSON.Property
+	@Json.Property
 	val value3 = ""
 
 	private val value4 = ""
@@ -21,7 +21,7 @@ class AnnotatedProperties(
 	val value5
 		get() = ""
 
-	@JSON.Property
+	@Json.Property
 	val value6
 		get() = ""
 
@@ -32,6 +32,6 @@ class AnnotatedProperties(
 val AnnotatedProperties.value8
 	get() = ""
 
-@JSON.Property
+@Json.Property
 val AnnotatedProperties.value9
 	get() = ""
diff --git a/annotation-processor/tests/cases/1/input/json/encoding/Automatic.kt b/annotation-processor/tests/cases/1/input/json/encoding/Automatic.kt
index 46cfce9..633ad66 100644
--- a/annotation-processor/tests/cases/1/input/json/encoding/Automatic.kt
+++ b/annotation-processor/tests/cases/1/input/json/encoding/Automatic.kt
@@ -1,11 +1,11 @@
 package json.encoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.Serializable
 
 
-@JSON(
-	encoding = JSON.Encoding.automatic
+@Json(
+	encoding = Json.Encoding.automatic
 )
 class Automatic(
 	val value1: String
@@ -13,7 +13,7 @@ class Automatic(
 
 	val value2 = ""
 
-	@JSON.Excluded
+	@Json.Excluded
 	val value3 = ""
 
 	private val value4 = ""
@@ -21,7 +21,7 @@ class Automatic(
 	val value5
 		get() = ""
 
-	@JSON.Property
+	@Json.Property
 	val value6
 		get() = ""
 
@@ -32,6 +32,6 @@ class Automatic(
 val Automatic.value8
 	get() = ""
 
-@JSON.Property
+@Json.Property
 val Automatic.value9
 	get() = ""
diff --git a/annotation-processor/tests/cases/1/input/json/encoding/Default.kt b/annotation-processor/tests/cases/1/input/json/encoding/Default.kt
index 91646ce..bb4bb6a 100644
--- a/annotation-processor/tests/cases/1/input/json/encoding/Default.kt
+++ b/annotation-processor/tests/cases/1/input/json/encoding/Default.kt
@@ -1,17 +1,17 @@
 package json.encoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.Serializable
 
 
-@JSON
+@Json
 class Default(
 	val value1: String
 ) : Serializable by "" {
 
 	val value2 = ""
 
-	@JSON.Excluded
+	@Json.Excluded
 	val value3 = ""
 
 	private val value4 = ""
@@ -19,7 +19,7 @@ class Default(
 	val value5
 		get() = ""
 
-	@JSON.Property
+	@Json.Property
 	val value6
 		get() = ""
 
@@ -30,6 +30,6 @@ class Default(
 val Default.value8
 	get() = ""
 
-@JSON.Property
+@Json.Property
 val Default.value9
 	get() = ""
diff --git a/annotation-processor/tests/cases/1/input/json/encoding/None.kt b/annotation-processor/tests/cases/1/input/json/encoding/None.kt
index 5dcddd4..2a1b964 100644
--- a/annotation-processor/tests/cases/1/input/json/encoding/None.kt
+++ b/annotation-processor/tests/cases/1/input/json/encoding/None.kt
@@ -1,11 +1,11 @@
 package json.encoding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.Serializable
 
 
-@JSON(
-	encoding = JSON.Encoding.none
+@Json(
+	encoding = Json.Encoding.none
 )
 class None(
 	val value1: String
diff --git a/annotation-processor/tests/cases/1/input/json/representation/AutomaticSingleValue.kt b/annotation-processor/tests/cases/1/input/json/representation/AutomaticSingleValue.kt
index 15971c9..8603a67 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/AutomaticSingleValue.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/AutomaticSingleValue.kt
@@ -1,9 +1,9 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	representation = JSON.Representation.automatic
+@Json(
+	representation = Json.Representation.automatic
 )
 inline class AutomaticSingleValue(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/representation/AutomaticStructured.kt b/annotation-processor/tests/cases/1/input/json/representation/AutomaticStructured.kt
index 9ad799f..4415112 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/AutomaticStructured.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/AutomaticStructured.kt
@@ -1,9 +1,9 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	representation = JSON.Representation.automatic
+@Json(
+	representation = Json.Representation.automatic
 )
 class AutomaticStructured(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/representation/DefaultSingleValue.kt b/annotation-processor/tests/cases/1/input/json/representation/DefaultSingleValue.kt
index fe647ad..81aac8d 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/DefaultSingleValue.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/DefaultSingleValue.kt
@@ -1,7 +1,7 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DefaultSingleValue(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/representation/DefaultStructured.kt b/annotation-processor/tests/cases/1/input/json/representation/DefaultStructured.kt
index 11d8e05..3c67090 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/DefaultStructured.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/DefaultStructured.kt
@@ -1,7 +1,7 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class DefaultStructured(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/representation/SingleValue.kt b/annotation-processor/tests/cases/1/input/json/representation/SingleValue.kt
index 971cdac..7c54360 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/SingleValue.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/SingleValue.kt
@@ -1,9 +1,9 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	representation = JSON.Representation.singleValue
+@Json(
+	representation = Json.Representation.singleValue
 )
 class SingleValue(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/representation/SingleValueGeneric.kt b/annotation-processor/tests/cases/1/input/json/representation/SingleValueGeneric.kt
index d42ec83..41706a3 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/SingleValueGeneric.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/SingleValueGeneric.kt
@@ -1,10 +1,10 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	representation = JSON.Representation.singleValue
+@Json(
+	representation = Json.Representation.singleValue
 )
 class SingleValueGeneric<Value : SingleValueGeneric.Bound?>(val value: Value) {
 
diff --git a/annotation-processor/tests/cases/1/input/json/representation/SingleValueNullable.kt b/annotation-processor/tests/cases/1/input/json/representation/SingleValueNullable.kt
index 114f80a..0e9fc30 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/SingleValueNullable.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/SingleValueNullable.kt
@@ -1,9 +1,9 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	representation = JSON.Representation.singleValue
+@Json(
+	representation = Json.Representation.singleValue
 )
 class SingleValueNullable(val value: String?)
diff --git a/annotation-processor/tests/cases/1/input/json/representation/Structured.kt b/annotation-processor/tests/cases/1/input/json/representation/Structured.kt
index 05b369e..3de5013 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/Structured.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/Structured.kt
@@ -1,9 +1,9 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	representation = JSON.Representation.structured
+@Json(
+	representation = Json.Representation.structured
 )
 inline class Structured(val value: String)
diff --git a/annotation-processor/tests/cases/1/input/json/representation/StructuredValueGeneric.kt b/annotation-processor/tests/cases/1/input/json/representation/StructuredValueGeneric.kt
index 101397a..c97a6c7 100644
--- a/annotation-processor/tests/cases/1/input/json/representation/StructuredValueGeneric.kt
+++ b/annotation-processor/tests/cases/1/input/json/representation/StructuredValueGeneric.kt
@@ -1,9 +1,9 @@
 package json.representation
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON(
-	representation = JSON.Representation.structured
+@Json(
+	representation = Json.Representation.structured
 )
 class StructuredValueGeneric<Value>(val value: Value)
diff --git a/annotation-processor/tests/cases/1/input/property/defaultValue/Automatic.kt b/annotation-processor/tests/cases/1/input/property/defaultValue/Automatic.kt
index 9758af9..a5a9c74 100644
--- a/annotation-processor/tests/cases/1/input/property/defaultValue/Automatic.kt
+++ b/annotation-processor/tests/cases/1/input/property/defaultValue/Automatic.kt
@@ -1,9 +1,9 @@
 package property.defaultValue
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class Automatic(
 	val value1: String,
 	val value2: String = "",
diff --git a/annotation-processor/tests/cases/1/input/property/defaultValue/AutomaticGeneric.kt b/annotation-processor/tests/cases/1/input/property/defaultValue/AutomaticGeneric.kt
index 9e403f8..a5e9ea4 100644
--- a/annotation-processor/tests/cases/1/input/property/defaultValue/AutomaticGeneric.kt
+++ b/annotation-processor/tests/cases/1/input/property/defaultValue/AutomaticGeneric.kt
@@ -1,9 +1,9 @@
 package property.defaultValue
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class AutomaticGeneric<T : AutomaticGeneric.SomeInterface>(
 	val value1: T,
 	val value2: T = error(""),
diff --git a/annotation-processor/tests/cases/1/input/property/serializedName/Automatic.kt b/annotation-processor/tests/cases/1/input/property/serializedName/Automatic.kt
index 62f7e90..3c14026 100644
--- a/annotation-processor/tests/cases/1/input/property/serializedName/Automatic.kt
+++ b/annotation-processor/tests/cases/1/input/property/serializedName/Automatic.kt
@@ -1,14 +1,14 @@
 package property.serializedName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class Automatic(
-	@JSON.Property(serializedName = JSON.automatic)
+	@Json.Property(serializedName = Json.automatic)
 	val value1: String
 ) {
 
-	@JSON.Property(serializedName = JSON.automatic)
+	@Json.Property(serializedName = Json.automatic)
 	val value2 = ""
 }
diff --git a/annotation-processor/tests/cases/1/input/property/serializedName/Custom.kt b/annotation-processor/tests/cases/1/input/property/serializedName/Custom.kt
index dcf30f6..4c2f1c6 100644
--- a/annotation-processor/tests/cases/1/input/property/serializedName/Custom.kt
+++ b/annotation-processor/tests/cases/1/input/property/serializedName/Custom.kt
@@ -1,14 +1,14 @@
 package property.serializedName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class Custom(
-	@JSON.Property(serializedName = "V A L U E 1")
+	@Json.Property(serializedName = "V A L U E 1")
 	val value1: String
 ) {
 
-	@JSON.Property(serializedName = "V A L U E 2")
+	@Json.Property(serializedName = "V A L U E 2")
 	val value2 = ""
 }
diff --git a/annotation-processor/tests/cases/1/input/property/serializedName/Default.kt b/annotation-processor/tests/cases/1/input/property/serializedName/Default.kt
index 2cb579b..50a5f7f 100644
--- a/annotation-processor/tests/cases/1/input/property/serializedName/Default.kt
+++ b/annotation-processor/tests/cases/1/input/property/serializedName/Default.kt
@@ -1,14 +1,14 @@
 package property.serializedName
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON
+@Json
 class Default(
-	@JSON.Property
+	@Json.Property
 	val value1: String
 ) {
 
-	@JSON.Property
+	@Json.Property
 	val value2 = ""
 }
diff --git a/annotation-processor/tests/cases/1/output-expected/AutomaticRootJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/AutomaticRootJSONCodec.kt
deleted file mode 100644
index c009cfb..0000000
--- a/annotation-processor/tests/cases/1/output-expected/AutomaticRootJSONCodec.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object AutomaticRootJSONCodec : AbstractJSONCodec<AutomaticRoot, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticRoot>):
-			AutomaticRoot {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return AutomaticRoot(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticRoot) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/AutomaticRootJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/AutomaticRootJsonCodec.kt
new file mode 100644
index 0000000..0374bd9
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/AutomaticRootJsonCodec.kt
@@ -0,0 +1,55 @@
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object AutomaticRootJsonCodec : AbstractJsonCodec<AutomaticRoot, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticRoot>):
+			AutomaticRoot {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return AutomaticRoot(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticRoot) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/CustomRootJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/CustomRootJSONCodec.kt
deleted file mode 100644
index 8734bcb..0000000
--- a/annotation-processor/tests/cases/1/output-expected/CustomRootJSONCodec.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import json.codecPackageName.CustomRoot
-import kotlin.String
-
-internal object CustomRootJSONCodec : AbstractJSONCodec<CustomRoot, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<CustomRoot>):
-			CustomRoot {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return CustomRoot(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: CustomRoot) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/CustomRootJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/CustomRootJsonCodec.kt
new file mode 100644
index 0000000..fcb2ad4
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/CustomRootJsonCodec.kt
@@ -0,0 +1,56 @@
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import json.codecPackageName.CustomRoot
+import kotlin.String
+
+internal object CustomRootJsonCodec : AbstractJsonCodec<CustomRoot, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<CustomRoot>):
+			CustomRoot {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return CustomRoot(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: CustomRoot) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/DefaultRootJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/DefaultRootJSONCodec.kt
deleted file mode 100644
index 183d337..0000000
--- a/annotation-processor/tests/cases/1/output-expected/DefaultRootJSONCodec.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DefaultRootJSONCodec : AbstractJSONCodec<DefaultRoot, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultRoot>):
-			DefaultRoot {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return DefaultRoot(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DefaultRoot) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/DefaultRootJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/DefaultRootJsonCodec.kt
new file mode 100644
index 0000000..a631702
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/DefaultRootJsonCodec.kt
@@ -0,0 +1,55 @@
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DefaultRootJsonCodec : AbstractJsonCodec<DefaultRoot, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultRoot>):
+			DefaultRoot {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return DefaultRoot(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DefaultRoot) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/codecProvider/GeneratedCustomContextCodecProvider.kt b/annotation-processor/tests/cases/1/output-expected/codecProvider/GeneratedCustomContextCodecProvider.kt
index caedab3..3889d28 100644
--- a/annotation-processor/tests/cases/1/output-expected/codecProvider/GeneratedCustomContextCodecProvider.kt
+++ b/annotation-processor/tests/cases/1/output-expected/codecProvider/GeneratedCustomContextCodecProvider.kt
@@ -1,50 +1,50 @@
 package codecProvider
 
-import AutomaticRootJSONCodec
-import CustomRootJSONCodec
-import DefaultRootJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodecProvider
+import AutomaticRootJsonCodec
+import CustomRootJsonCodec
+import DefaultRootJsonCodec
+import io.fluidsonic.json.JsonCodecProvider
 import kotlin.Suppress
 import kotlin.reflect.KClass
 
 private object GeneratedCustomContextCodecProvider : CustomContextCodecProvider,
-		JSONCodecProvider<CustomCodingContext> by JSONCodecProvider(AutomaticRootJSONCodec,
-		CustomRootJSONCodec, DefaultRootJSONCodec, customProperties.CustomContextJSONCodec,
-		customProperties.DifferentPackageJSONCodec, customProperties.SamePackageJSONCodec,
-		externalType.ExternalPairCodec, externalType.KT30280JSONCodec,
-		externalType.KT30280PrimitiveJSONCodec, json.classes.ClassJSONCodec,
-		json.classes.DataClassJSONCodec, json.classes.GenericClassJSONCodec,
-		json.classes.InlineClassJSONCodec, json.classes.ObjectJSONCodec,
-		json.codecName.AutomaticJSONCodec, json.codecName.CustomizedJSONCodec,
-		json.codecName.DefaultJSONCodec, json.codecPackageName.AutomaticJSONCodec,
-		json.codecPackageName.DefaultJSONCodec, json.codecPackageName.customized.CustomJSONCodec,
-		json.codecVisibility.AutomaticInternalForContainedClass_ContainedClassJSONCodec,
-		json.codecVisibility.AutomaticInternalJSONCodec, json.codecVisibility.AutomaticPublicJSONCodec,
-		json.codecVisibility.DefaultInternalJSONCodec, json.codecVisibility.InternalJSONCodec,
-		json.codecVisibility.PublicJSONCodec, json.decoding.AnnotatedConstructorJSONCodec,
-		json.decoding.AutomaticAnnotatedConstructorJSONCodec, json.decoding.AutomaticObjectJSONCodec,
-		json.decoding.AutomaticPrimaryConstructorJSONCodec,
-		json.decoding.AutomaticSecondaryConstructorPrimaryExcludedJSONCodec,
-		json.decoding.AutomaticSecondaryConstructorPrimaryInaccessibleJSONCodec,
-		json.decoding.AutomaticSecondaryConstructorPrimaryNotPresentJSONCodec,
-		json.decoding.ConstructorParameterOrderJSONCodec,
-		json.decoding.DefaultAnnotatedConstructorJSONCodec, json.decoding.DefaultObjectJSONCodec,
-		json.decoding.DefaultPrimaryConstructorJSONCodec,
-		json.decoding.DefaultSecondaryConstructorPrimaryExcludedJSONCodec,
-		json.decoding.DefaultSecondaryConstructorPrimaryInaccessibleJSONCodec,
-		json.decoding.DefaultSecondaryConstructorPrimaryNotPresentJSONCodec, json.decoding.NoneJSONCodec,
-		json.decoding.PrimaryConstructorJSONCodec, json.encoding.AllPropertiesJSONCodec,
-		json.encoding.AnnotatedPropertiesJSONCodec, json.encoding.AutomaticJSONCodec,
-		json.encoding.DefaultJSONCodec, json.encoding.NoneJSONCodec,
-		json.representation.AutomaticSingleValueJSONCodec,
-		json.representation.AutomaticStructuredJSONCodec, json.representation.DefaultSingleValueJSONCodec,
-		json.representation.DefaultStructuredJSONCodec, json.representation.SingleValueGenericJSONCodec,
-		json.representation.SingleValueJSONCodec, json.representation.SingleValueNullableJSONCodec,
-		json.representation.StructuredJSONCodec, json.representation.StructuredValueGenericJSONCodec,
-		property.defaultValue.AutomaticGenericJSONCodec, property.defaultValue.AutomaticJSONCodec,
-		property.serializedName.AutomaticJSONCodec, property.serializedName.CustomJSONCodec,
-		property.serializedName.DefaultJSONCodec)
+		JsonCodecProvider<CustomCodingContext> by JsonCodecProvider(AutomaticRootJsonCodec,
+		CustomRootJsonCodec, DefaultRootJsonCodec, customProperties.CustomContextJsonCodec,
+		customProperties.DifferentPackageJsonCodec, customProperties.SamePackageJsonCodec,
+		externalType.ExternalPairCodec, externalType.KT30280JsonCodec,
+		externalType.KT30280PrimitiveJsonCodec, json.classes.ClassJsonCodec,
+		json.classes.DataClassJsonCodec, json.classes.GenericClassJsonCodec,
+		json.classes.InlineClassJsonCodec, json.classes.ObjectJsonCodec,
+		json.codecName.AutomaticJsonCodec, json.codecName.CustomizedJsonCodec,
+		json.codecName.DefaultJsonCodec, json.codecPackageName.AutomaticJsonCodec,
+		json.codecPackageName.DefaultJsonCodec, json.codecPackageName.customized.CustomJsonCodec,
+		json.codecVisibility.AutomaticInternalForContainedClass_ContainedClassJsonCodec,
+		json.codecVisibility.AutomaticInternalJsonCodec, json.codecVisibility.AutomaticPublicJsonCodec,
+		json.codecVisibility.DefaultInternalJsonCodec, json.codecVisibility.InternalJsonCodec,
+		json.codecVisibility.PublicJsonCodec, json.decoding.AnnotatedConstructorJsonCodec,
+		json.decoding.AutomaticAnnotatedConstructorJsonCodec, json.decoding.AutomaticObjectJsonCodec,
+		json.decoding.AutomaticPrimaryConstructorJsonCodec,
+		json.decoding.AutomaticSecondaryConstructorPrimaryExcludedJsonCodec,
+		json.decoding.AutomaticSecondaryConstructorPrimaryInaccessibleJsonCodec,
+		json.decoding.AutomaticSecondaryConstructorPrimaryNotPresentJsonCodec,
+		json.decoding.ConstructorParameterOrderJsonCodec,
+		json.decoding.DefaultAnnotatedConstructorJsonCodec, json.decoding.DefaultObjectJsonCodec,
+		json.decoding.DefaultPrimaryConstructorJsonCodec,
+		json.decoding.DefaultSecondaryConstructorPrimaryExcludedJsonCodec,
+		json.decoding.DefaultSecondaryConstructorPrimaryInaccessibleJsonCodec,
+		json.decoding.DefaultSecondaryConstructorPrimaryNotPresentJsonCodec, json.decoding.NoneJsonCodec,
+		json.decoding.PrimaryConstructorJsonCodec, json.encoding.AllPropertiesJsonCodec,
+		json.encoding.AnnotatedPropertiesJsonCodec, json.encoding.AutomaticJsonCodec,
+		json.encoding.DefaultJsonCodec, json.encoding.NoneJsonCodec,
+		json.representation.AutomaticSingleValueJsonCodec,
+		json.representation.AutomaticStructuredJsonCodec, json.representation.DefaultSingleValueJsonCodec,
+		json.representation.DefaultStructuredJsonCodec, json.representation.SingleValueGenericJsonCodec,
+		json.representation.SingleValueJsonCodec, json.representation.SingleValueNullableJsonCodec,
+		json.representation.StructuredJsonCodec, json.representation.StructuredValueGenericJsonCodec,
+		property.defaultValue.AutomaticGenericJsonCodec, property.defaultValue.AutomaticJsonCodec,
+		property.serializedName.AutomaticJsonCodec, property.serializedName.CustomJsonCodec,
+		property.serializedName.DefaultJsonCodec)
 
 @Suppress("UNUSED_PARAMETER")
-fun JSONCodecProvider.Companion.generated(interfaceClass: KClass<CustomContextCodecProvider>):
+fun JsonCodecProvider.Companion.generated(interfaceClass: KClass<CustomContextCodecProvider>):
 		CustomContextCodecProvider = GeneratedCustomContextCodecProvider
diff --git a/annotation-processor/tests/cases/1/output-expected/customProperties/CustomContextJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/customProperties/CustomContextJSONCodec.kt
deleted file mode 100644
index e387697..0000000
--- a/annotation-processor/tests/cases/1/output-expected/customProperties/CustomContextJSONCodec.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package customProperties
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import customProperties.writeCustomProperties2
-import kotlin.String
-
-internal object CustomContextJSONCodec : AbstractJSONCodec<CustomContext, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<CustomContext>):
-			CustomContext {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return CustomContext(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: CustomContext) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-			value.run { this@encode.writeCustomProperties1() }
-			writeCustomProperties2(value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/customProperties/CustomContextJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/customProperties/CustomContextJsonCodec.kt
new file mode 100644
index 0000000..7405916
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/customProperties/CustomContextJsonCodec.kt
@@ -0,0 +1,60 @@
+package customProperties
+
+import codecProvider.CustomCodingContext
+import customProperties.writeCustomProperties2
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object CustomContextJsonCodec : AbstractJsonCodec<CustomContext, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<CustomContext>):
+			CustomContext {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return CustomContext(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: CustomContext) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+			value.run { this@encode.writeCustomProperties1() }
+			writeCustomProperties2(value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/customProperties/DifferentPackageJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/customProperties/DifferentPackageJSONCodec.kt
deleted file mode 100644
index b541f9a..0000000
--- a/annotation-processor/tests/cases/1/output-expected/customProperties/DifferentPackageJSONCodec.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package customProperties
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import customProperties.differentPackage.writeCustomProperties3
-import customProperties.writeCustomProperties2
-import kotlin.String
-
-internal object DifferentPackageJSONCodec : AbstractJSONCodec<DifferentPackage,
-		CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DifferentPackage>):
-			DifferentPackage {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return DifferentPackage(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DifferentPackage) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-			value.run { this@encode.writeCustomProperties1() }
-			writeCustomProperties2(value)
-			writeCustomProperties3(value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/customProperties/DifferentPackageJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/customProperties/DifferentPackageJsonCodec.kt
new file mode 100644
index 0000000..0afa4d2
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/customProperties/DifferentPackageJsonCodec.kt
@@ -0,0 +1,63 @@
+package customProperties
+
+import codecProvider.CustomCodingContext
+import customProperties.differentPackage.writeCustomProperties3
+import customProperties.writeCustomProperties2
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DifferentPackageJsonCodec : AbstractJsonCodec<DifferentPackage,
+		CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DifferentPackage>):
+			DifferentPackage {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return DifferentPackage(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DifferentPackage) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+			value.run { this@encode.writeCustomProperties1() }
+			writeCustomProperties2(value)
+			writeCustomProperties3(value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/customProperties/SamePackageJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/customProperties/SamePackageJSONCodec.kt
deleted file mode 100644
index e532494..0000000
--- a/annotation-processor/tests/cases/1/output-expected/customProperties/SamePackageJSONCodec.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package customProperties
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import customProperties.writeCustomProperties2
-import kotlin.String
-
-internal object SamePackageJSONCodec : AbstractJSONCodec<SamePackage, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<SamePackage>):
-			SamePackage {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return SamePackage(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: SamePackage) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-			value.run { this@encode.writeCustomProperties1() }
-			writeCustomProperties2(value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/customProperties/SamePackageJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/customProperties/SamePackageJsonCodec.kt
new file mode 100644
index 0000000..717d2cb
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/customProperties/SamePackageJsonCodec.kt
@@ -0,0 +1,60 @@
+package customProperties
+
+import codecProvider.CustomCodingContext
+import customProperties.writeCustomProperties2
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object SamePackageJsonCodec : AbstractJsonCodec<SamePackage, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<SamePackage>):
+			SamePackage {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return SamePackage(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: SamePackage) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+			value.run { this@encode.writeCustomProperties1() }
+			writeCustomProperties2(value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/externalType/ExternalPairCodec.kt b/annotation-processor/tests/cases/1/output-expected/externalType/ExternalPairCodec.kt
index e0f8ac4..c1e27f5 100644
--- a/annotation-processor/tests/cases/1/output-expected/externalType/ExternalPairCodec.kt
+++ b/annotation-processor/tests/cases/1/output-expected/externalType/ExternalPairCodec.kt
@@ -1,40 +1,40 @@
 package externalType
 
 import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
 import kotlin.Any
 import kotlin.Pair
 
-object ExternalPairCodec : AbstractJSONCodec<Pair<*, *>, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Pair<*, *>>):
+object ExternalPairCodec : AbstractJsonCodec<Pair<*, *>, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Pair<*, *>>):
 			Pair<*, *> {
 		var _first: Any? = null
 		var _second: Any? = null
@@ -53,7 +53,7 @@ object ExternalPairCodec : AbstractJSONCodec<Pair<*, *>, CustomCodingContext>()
 		)
 	}
 
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Pair<*, *>) {
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Pair<*, *>) {
 		writeIntoMap {
 			writeMapElement("first", value = value.first)
 			writeMapElement("second", value = value.second)
diff --git a/annotation-processor/tests/cases/1/output-expected/externalType/KT30280JSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/externalType/KT30280JSONCodec.kt
deleted file mode 100644
index 2d0369d..0000000
--- a/annotation-processor/tests/cases/1/output-expected/externalType/KT30280JSONCodec.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package externalType
-
-import codecProvider.CustomCodingContext
-import codecProvider.KT30280
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object KT30280JSONCodec : AbstractJSONCodec<KT30280, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<KT30280>): KT30280 =
-			KT30280(value = readString())
-	override fun JSONEncoder<CustomCodingContext>.encode(value: KT30280) {
-		writeString(value.value)
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/externalType/KT30280JsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/externalType/KT30280JsonCodec.kt
new file mode 100644
index 0000000..3bb2eaf
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/externalType/KT30280JsonCodec.kt
@@ -0,0 +1,28 @@
+package externalType
+
+import codecProvider.CustomCodingContext
+import codecProvider.KT30280
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object KT30280JsonCodec : AbstractJsonCodec<KT30280, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<KT30280>): KT30280 =
+			KT30280(value = readString())
+	override fun JsonEncoder<CustomCodingContext>.encode(value: KT30280) {
+		writeString(value.value)
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/externalType/KT30280PrimitiveJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/externalType/KT30280PrimitiveJSONCodec.kt
deleted file mode 100644
index e2d9b49..0000000
--- a/annotation-processor/tests/cases/1/output-expected/externalType/KT30280PrimitiveJSONCodec.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package externalType
-
-import codecProvider.CustomCodingContext
-import codecProvider.KT30280Primitive
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object KT30280PrimitiveJSONCodec : AbstractJSONCodec<KT30280Primitive,
-		CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<KT30280Primitive>):
-			KT30280Primitive = KT30280Primitive(value = readDouble())
-	override fun JSONEncoder<CustomCodingContext>.encode(value: KT30280Primitive) {
-		writeDouble(value.value)
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/externalType/KT30280PrimitiveJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/externalType/KT30280PrimitiveJsonCodec.kt
new file mode 100644
index 0000000..9645371
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/externalType/KT30280PrimitiveJsonCodec.kt
@@ -0,0 +1,29 @@
+package externalType
+
+import codecProvider.CustomCodingContext
+import codecProvider.KT30280Primitive
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object KT30280PrimitiveJsonCodec : AbstractJsonCodec<KT30280Primitive,
+		CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<KT30280Primitive>):
+			KT30280Primitive = KT30280Primitive(value = readDouble())
+	override fun JsonEncoder<CustomCodingContext>.encode(value: KT30280Primitive) {
+		writeDouble(value.value)
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/ClassJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/ClassJSONCodec.kt
deleted file mode 100644
index 470bda9..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/classes/ClassJSONCodec.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package json.classes
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object ClassJSONCodec : AbstractJSONCodec<Class, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Class>): Class {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Class(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Class) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/ClassJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/ClassJsonCodec.kt
new file mode 100644
index 0000000..27cce0b
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/classes/ClassJsonCodec.kt
@@ -0,0 +1,56 @@
+package json.classes
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object ClassJsonCodec : AbstractJsonCodec<Class, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Class>): Class {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Class(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Class) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/DataClassJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/DataClassJSONCodec.kt
deleted file mode 100644
index f77ccf6..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/classes/DataClassJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package json.classes
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DataClassJSONCodec : AbstractJSONCodec<DataClass, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DataClass>):
-			DataClass {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return DataClass(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DataClass) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/DataClassJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/DataClassJsonCodec.kt
new file mode 100644
index 0000000..e28dfef
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/classes/DataClassJsonCodec.kt
@@ -0,0 +1,57 @@
+package json.classes
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DataClassJsonCodec : AbstractJsonCodec<DataClass, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DataClass>):
+			DataClass {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return DataClass(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DataClass) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/GenericClassJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/GenericClassJSONCodec.kt
deleted file mode 100644
index cbf3406..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/classes/GenericClassJSONCodec.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package json.classes
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.Any
-
-internal object GenericClassJSONCodec : AbstractJSONCodec<GenericClass<*, *, *>,
-		CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<GenericClass<*, *,
-			*>>): GenericClass<*, *, *> {
-		var _a: Any? = null
-		var _b: GenericClass.Bound? = null
-		var _c: Any? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"a" -> _a = readValueOfTypeOrNull(valueType.arguments[0])
-				"b" -> _b = readValueOfType(valueType.arguments[1]) as GenericClass.Bound
-				"c" -> _c = readValueOfType(valueType.arguments[2])
-				else -> skipValue()
-			}
-		}
-
-		return GenericClass(
-			a = _a,
-			b = _b ?: missingPropertyError("b"),
-			c = _c ?: missingPropertyError("c")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: GenericClass<*, *, *>) {
-		writeIntoMap {
-			writeMapElement("a", value = value.a)
-			writeMapElement("b", value = value.b)
-			writeMapElement("c", value = value.c)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/GenericClassJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/GenericClassJsonCodec.kt
new file mode 100644
index 0000000..0324fb1
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/classes/GenericClassJsonCodec.kt
@@ -0,0 +1,66 @@
+package json.classes
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.Any
+
+internal object GenericClassJsonCodec : AbstractJsonCodec<GenericClass<*, *, *>,
+		CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<GenericClass<*, *,
+			*>>): GenericClass<*, *, *> {
+		var _a: Any? = null
+		var _b: GenericClass.Bound? = null
+		var _c: Any? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"a" -> _a = readValueOfTypeOrNull(valueType.arguments[0])
+				"b" -> _b = readValueOfType(valueType.arguments[1]) as GenericClass.Bound
+				"c" -> _c = readValueOfType(valueType.arguments[2])
+				else -> skipValue()
+			}
+		}
+
+		return GenericClass(
+			a = _a,
+			b = _b ?: missingPropertyError("b"),
+			c = _c ?: missingPropertyError("c")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: GenericClass<*, *, *>) {
+		writeIntoMap {
+			writeMapElement("a", value = value.a)
+			writeMapElement("b", value = value.b)
+			writeMapElement("c", value = value.c)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/InlineClassJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/InlineClassJSONCodec.kt
deleted file mode 100644
index 755928f..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/classes/InlineClassJSONCodec.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package json.classes
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object InlineClassJSONCodec : AbstractJSONCodec<InlineClass, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<InlineClass>):
-			InlineClass = InlineClass(value = readString())
-	override fun JSONEncoder<CustomCodingContext>.encode(value: InlineClass) {
-		writeString(value.value)
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/InlineClassJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/InlineClassJsonCodec.kt
new file mode 100644
index 0000000..becef50
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/classes/InlineClassJsonCodec.kt
@@ -0,0 +1,27 @@
+package json.classes
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object InlineClassJsonCodec : AbstractJsonCodec<InlineClass, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<InlineClass>):
+			InlineClass = InlineClass(value = readString())
+	override fun JsonEncoder<CustomCodingContext>.encode(value: InlineClass) {
+		writeString(value.value)
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/ObjectJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/ObjectJSONCodec.kt
deleted file mode 100644
index ea5ea73..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/classes/ObjectJSONCodec.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package json.classes
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONEncoderCodec
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object ObjectJSONCodec : AbstractJSONEncoderCodec<Object, CustomCodingContext>() {
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Object) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/classes/ObjectJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/classes/ObjectJsonCodec.kt
new file mode 100644
index 0000000..3f4682f
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/classes/ObjectJsonCodec.kt
@@ -0,0 +1,25 @@
+package json.classes
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonEncoderCodec
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object ObjectJsonCodec : AbstractJsonEncoderCodec<Object, CustomCodingContext>() {
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Object) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecName/AutomaticJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecName/AutomaticJSONCodec.kt
deleted file mode 100644
index 6001daa..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecName/AutomaticJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package json.codecName
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object AutomaticJSONCodec : AbstractJSONCodec<Automatic, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Automatic>):
-			Automatic {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Automatic(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Automatic) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecName/AutomaticJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecName/AutomaticJsonCodec.kt
new file mode 100644
index 0000000..9385d24
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecName/AutomaticJsonCodec.kt
@@ -0,0 +1,57 @@
+package json.codecName
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object AutomaticJsonCodec : AbstractJsonCodec<Automatic, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Automatic>):
+			Automatic {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Automatic(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Automatic) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecName/CustomizedJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecName/CustomizedJSONCodec.kt
deleted file mode 100644
index 6440fe5..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecName/CustomizedJSONCodec.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package json.codecName
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object CustomizedJSONCodec : AbstractJSONCodec<Custom, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Custom>): Custom {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Custom(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Custom) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecName/CustomizedJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecName/CustomizedJsonCodec.kt
new file mode 100644
index 0000000..67676ee
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecName/CustomizedJsonCodec.kt
@@ -0,0 +1,56 @@
+package json.codecName
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object CustomizedJsonCodec : AbstractJsonCodec<Custom, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Custom>): Custom {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Custom(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Custom) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecName/DefaultJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecName/DefaultJSONCodec.kt
deleted file mode 100644
index d8bb355..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecName/DefaultJSONCodec.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package json.codecName
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DefaultJSONCodec : AbstractJSONCodec<Default, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Default>): Default {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Default(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Default) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecName/DefaultJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecName/DefaultJsonCodec.kt
new file mode 100644
index 0000000..9a3eae1
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecName/DefaultJsonCodec.kt
@@ -0,0 +1,56 @@
+package json.codecName
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DefaultJsonCodec : AbstractJsonCodec<Default, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Default>): Default {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Default(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Default) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/AutomaticJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/AutomaticJSONCodec.kt
deleted file mode 100644
index 49f3cc2..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/AutomaticJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package json.codecPackageName
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object AutomaticJSONCodec : AbstractJSONCodec<Automatic, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Automatic>):
-			Automatic {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Automatic(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Automatic) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/AutomaticJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/AutomaticJsonCodec.kt
new file mode 100644
index 0000000..3c78578
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/AutomaticJsonCodec.kt
@@ -0,0 +1,57 @@
+package json.codecPackageName
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object AutomaticJsonCodec : AbstractJsonCodec<Automatic, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Automatic>):
+			Automatic {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Automatic(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Automatic) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/DefaultJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/DefaultJSONCodec.kt
deleted file mode 100644
index 15dc398..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/DefaultJSONCodec.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package json.codecPackageName
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DefaultJSONCodec : AbstractJSONCodec<Default, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Default>): Default {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Default(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Default) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/DefaultJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/DefaultJsonCodec.kt
new file mode 100644
index 0000000..f587c88
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/DefaultJsonCodec.kt
@@ -0,0 +1,56 @@
+package json.codecPackageName
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DefaultJsonCodec : AbstractJsonCodec<Default, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Default>): Default {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Default(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Default) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/customized/CustomJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/customized/CustomJSONCodec.kt
deleted file mode 100644
index 39af166..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/customized/CustomJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package json.codecPackageName.customized
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import json.codecPackageName.Custom
-import kotlin.String
-
-internal object CustomJSONCodec : AbstractJSONCodec<Custom, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Custom>): Custom {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Custom(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Custom) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/customized/CustomJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/customized/CustomJsonCodec.kt
new file mode 100644
index 0000000..fb60aad
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecPackageName/customized/CustomJsonCodec.kt
@@ -0,0 +1,57 @@
+package json.codecPackageName.customized
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import json.codecPackageName.Custom
+import kotlin.String
+
+internal object CustomJsonCodec : AbstractJsonCodec<Custom, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Custom>): Custom {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Custom(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Custom) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalForContainedClass_ContainedClassJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalForContainedClass_ContainedClassJSONCodec.kt
deleted file mode 100644
index 0250fc5..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalForContainedClass_ContainedClassJSONCodec.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package json.codecVisibility
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object AutomaticInternalForContainedClass_ContainedClassJSONCodec :
-		AbstractJSONCodec<AutomaticInternalForContainedClass.ContainedClass, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticInternalForContainedClass.ContainedClass>):
-			AutomaticInternalForContainedClass.ContainedClass {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return AutomaticInternalForContainedClass.ContainedClass(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override
-			fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticInternalForContainedClass.ContainedClass) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalForContainedClass_ContainedClassJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalForContainedClass_ContainedClassJsonCodec.kt
new file mode 100644
index 0000000..0a63c81
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalForContainedClass_ContainedClassJsonCodec.kt
@@ -0,0 +1,60 @@
+package json.codecVisibility
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object AutomaticInternalForContainedClass_ContainedClassJsonCodec :
+		AbstractJsonCodec<AutomaticInternalForContainedClass.ContainedClass, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticInternalForContainedClass.ContainedClass>):
+			AutomaticInternalForContainedClass.ContainedClass {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return AutomaticInternalForContainedClass.ContainedClass(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override
+			fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticInternalForContainedClass.ContainedClass) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalJSONCodec.kt
deleted file mode 100644
index 2d05dc0..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalJSONCodec.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package json.codecVisibility
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object AutomaticInternalJSONCodec : AbstractJSONCodec<AutomaticInternal,
-		CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticInternal>):
-			AutomaticInternal {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return AutomaticInternal(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticInternal) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalJsonCodec.kt
new file mode 100644
index 0000000..3278fb2
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticInternalJsonCodec.kt
@@ -0,0 +1,58 @@
+package json.codecVisibility
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object AutomaticInternalJsonCodec : AbstractJsonCodec<AutomaticInternal,
+		CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticInternal>):
+			AutomaticInternal {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return AutomaticInternal(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticInternal) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticPublicJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticPublicJSONCodec.kt
deleted file mode 100644
index c3ad1bc..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticPublicJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package json.codecVisibility
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-object AutomaticPublicJSONCodec : AbstractJSONCodec<AutomaticPublic, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticPublic>):
-			AutomaticPublic {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return AutomaticPublic(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticPublic) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticPublicJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticPublicJsonCodec.kt
new file mode 100644
index 0000000..b33d7ee
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/AutomaticPublicJsonCodec.kt
@@ -0,0 +1,57 @@
+package json.codecVisibility
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+object AutomaticPublicJsonCodec : AbstractJsonCodec<AutomaticPublic, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticPublic>):
+			AutomaticPublic {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return AutomaticPublic(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticPublic) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/DefaultInternalJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/DefaultInternalJSONCodec.kt
deleted file mode 100644
index 0129628..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/DefaultInternalJSONCodec.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package json.codecVisibility
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DefaultInternalJSONCodec : AbstractJSONCodec<DefaultInternal, CustomCodingContext>()
-		{
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultInternal>):
-			DefaultInternal {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return DefaultInternal(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DefaultInternal) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/DefaultInternalJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/DefaultInternalJsonCodec.kt
new file mode 100644
index 0000000..b34f2af
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/DefaultInternalJsonCodec.kt
@@ -0,0 +1,58 @@
+package json.codecVisibility
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DefaultInternalJsonCodec : AbstractJsonCodec<DefaultInternal, CustomCodingContext>()
+		{
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultInternal>):
+			DefaultInternal {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return DefaultInternal(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DefaultInternal) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/InternalJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/InternalJSONCodec.kt
deleted file mode 100644
index 6d2cffd..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/InternalJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package json.codecVisibility
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object InternalJSONCodec : AbstractJSONCodec<Internal, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Internal>):
-			Internal {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Internal(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Internal) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/InternalJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/InternalJsonCodec.kt
new file mode 100644
index 0000000..853e3d2
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/InternalJsonCodec.kt
@@ -0,0 +1,57 @@
+package json.codecVisibility
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object InternalJsonCodec : AbstractJsonCodec<Internal, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Internal>):
+			Internal {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Internal(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Internal) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/PublicJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/PublicJSONCodec.kt
deleted file mode 100644
index c0955a7..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/PublicJSONCodec.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package json.codecVisibility
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-object PublicJSONCodec : AbstractJSONCodec<Public, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Public>): Public {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Public(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Public) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/PublicJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/PublicJsonCodec.kt
new file mode 100644
index 0000000..ec8306f
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/codecVisibility/PublicJsonCodec.kt
@@ -0,0 +1,56 @@
+package json.codecVisibility
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+object PublicJsonCodec : AbstractJsonCodec<Public, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Public>): Public {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Public(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Public) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AnnotatedConstructorJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AnnotatedConstructorJSONCodec.kt
deleted file mode 100644
index 01ba43d..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/AnnotatedConstructorJSONCodec.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object AnnotatedConstructorJSONCodec : AbstractJSONCodec<AnnotatedConstructor,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AnnotatedConstructor>):
-			AnnotatedConstructor {
-		var _value = 0L
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readLong()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return AnnotatedConstructor(
-			value = _value
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AnnotatedConstructor) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AnnotatedConstructorJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AnnotatedConstructorJsonCodec.kt
new file mode 100644
index 0000000..139c31c
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/AnnotatedConstructorJsonCodec.kt
@@ -0,0 +1,64 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object AnnotatedConstructorJsonCodec : AbstractJsonCodec<AnnotatedConstructor,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AnnotatedConstructor>):
+			AnnotatedConstructor {
+		var _value = 0L
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readLong()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return AnnotatedConstructor(
+			value = _value
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AnnotatedConstructor) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticAnnotatedConstructorJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticAnnotatedConstructorJSONCodec.kt
deleted file mode 100644
index 9fbfff2..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticAnnotatedConstructorJSONCodec.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object AutomaticAnnotatedConstructorJSONCodec :
-		AbstractJSONCodec<AutomaticAnnotatedConstructor, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticAnnotatedConstructor>):
-			AutomaticAnnotatedConstructor {
-		var _value = 0L
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readLong()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return AutomaticAnnotatedConstructor(
-			value = _value
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticAnnotatedConstructor) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticAnnotatedConstructorJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticAnnotatedConstructorJsonCodec.kt
new file mode 100644
index 0000000..04e71a5
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticAnnotatedConstructorJsonCodec.kt
@@ -0,0 +1,64 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object AutomaticAnnotatedConstructorJsonCodec :
+		AbstractJsonCodec<AutomaticAnnotatedConstructor, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticAnnotatedConstructor>):
+			AutomaticAnnotatedConstructor {
+		var _value = 0L
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readLong()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return AutomaticAnnotatedConstructor(
+			value = _value
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticAnnotatedConstructor) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticObjectJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticObjectJSONCodec.kt
deleted file mode 100644
index cfd8080..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticObjectJSONCodec.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONEncoderCodec
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object AutomaticObjectJSONCodec : AbstractJSONEncoderCodec<AutomaticObject,
-		CustomCodingContext>() {
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticObject) {
-		writeIntoMap {
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticObjectJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticObjectJsonCodec.kt
new file mode 100644
index 0000000..419052a
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticObjectJsonCodec.kt
@@ -0,0 +1,25 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonEncoderCodec
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object AutomaticObjectJsonCodec : AbstractJsonEncoderCodec<AutomaticObject,
+		CustomCodingContext>() {
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticObject) {
+		writeIntoMap {
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticPrimaryConstructorJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticPrimaryConstructorJSONCodec.kt
deleted file mode 100644
index 12acfd2..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticPrimaryConstructorJSONCodec.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object AutomaticPrimaryConstructorJSONCodec :
-		AbstractJSONCodec<AutomaticPrimaryConstructor, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticPrimaryConstructor>):
-			AutomaticPrimaryConstructor {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return AutomaticPrimaryConstructor(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticPrimaryConstructor) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticPrimaryConstructorJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticPrimaryConstructorJsonCodec.kt
new file mode 100644
index 0000000..2028f5f
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticPrimaryConstructorJsonCodec.kt
@@ -0,0 +1,59 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object AutomaticPrimaryConstructorJsonCodec :
+		AbstractJsonCodec<AutomaticPrimaryConstructor, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticPrimaryConstructor>):
+			AutomaticPrimaryConstructor {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return AutomaticPrimaryConstructor(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticPrimaryConstructor) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryExcludedJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryExcludedJSONCodec.kt
deleted file mode 100644
index 270bed7..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryExcludedJSONCodec.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object AutomaticSecondaryConstructorPrimaryExcludedJSONCodec :
-		AbstractJSONCodec<AutomaticSecondaryConstructorPrimaryExcluded, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticSecondaryConstructorPrimaryExcluded>):
-			AutomaticSecondaryConstructorPrimaryExcluded {
-		var _value = 0
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readInt()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return AutomaticSecondaryConstructorPrimaryExcluded(
-			value = _value
-		)
-	}
-
-	override
-			fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticSecondaryConstructorPrimaryExcluded) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryExcludedJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryExcludedJsonCodec.kt
new file mode 100644
index 0000000..7dcf473
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryExcludedJsonCodec.kt
@@ -0,0 +1,65 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object AutomaticSecondaryConstructorPrimaryExcludedJsonCodec :
+		AbstractJsonCodec<AutomaticSecondaryConstructorPrimaryExcluded, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticSecondaryConstructorPrimaryExcluded>):
+			AutomaticSecondaryConstructorPrimaryExcluded {
+		var _value = 0
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readInt()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return AutomaticSecondaryConstructorPrimaryExcluded(
+			value = _value
+		)
+	}
+
+	override
+			fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticSecondaryConstructorPrimaryExcluded) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessibleJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessibleJSONCodec.kt
deleted file mode 100644
index 5097c5f..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessibleJSONCodec.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object AutomaticSecondaryConstructorPrimaryInaccessibleJSONCodec :
-		AbstractJSONCodec<AutomaticSecondaryConstructorPrimaryInaccessible, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticSecondaryConstructorPrimaryInaccessible>):
-			AutomaticSecondaryConstructorPrimaryInaccessible {
-		var _value = 0
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readInt()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return AutomaticSecondaryConstructorPrimaryInaccessible(
-			value = _value
-		)
-	}
-
-	override
-			fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticSecondaryConstructorPrimaryInaccessible) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessibleJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessibleJsonCodec.kt
new file mode 100644
index 0000000..23419c0
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryInaccessibleJsonCodec.kt
@@ -0,0 +1,65 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object AutomaticSecondaryConstructorPrimaryInaccessibleJsonCodec :
+		AbstractJsonCodec<AutomaticSecondaryConstructorPrimaryInaccessible, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticSecondaryConstructorPrimaryInaccessible>):
+			AutomaticSecondaryConstructorPrimaryInaccessible {
+		var _value = 0
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readInt()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return AutomaticSecondaryConstructorPrimaryInaccessible(
+			value = _value
+		)
+	}
+
+	override
+			fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticSecondaryConstructorPrimaryInaccessible) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresentJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresentJSONCodec.kt
deleted file mode 100644
index 9575a04..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresentJSONCodec.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object AutomaticSecondaryConstructorPrimaryNotPresentJSONCodec :
-		AbstractJSONCodec<AutomaticSecondaryConstructorPrimaryNotPresent, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticSecondaryConstructorPrimaryNotPresent>):
-			AutomaticSecondaryConstructorPrimaryNotPresent {
-		var _value = 0
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readInt()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return AutomaticSecondaryConstructorPrimaryNotPresent(
-			value = _value
-		)
-	}
-
-	override
-			fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticSecondaryConstructorPrimaryNotPresent) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresentJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresentJsonCodec.kt
new file mode 100644
index 0000000..36d5d52
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/AutomaticSecondaryConstructorPrimaryNotPresentJsonCodec.kt
@@ -0,0 +1,65 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object AutomaticSecondaryConstructorPrimaryNotPresentJsonCodec :
+		AbstractJsonCodec<AutomaticSecondaryConstructorPrimaryNotPresent, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticSecondaryConstructorPrimaryNotPresent>):
+			AutomaticSecondaryConstructorPrimaryNotPresent {
+		var _value = 0
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readInt()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return AutomaticSecondaryConstructorPrimaryNotPresent(
+			value = _value
+		)
+	}
+
+	override
+			fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticSecondaryConstructorPrimaryNotPresent) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/ConstructorParameterOrderJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/ConstructorParameterOrderJsonCodec.kt
similarity index 57%
rename from annotation-processor/tests/cases/1/output-expected/json/decoding/ConstructorParameterOrderJSONCodec.kt
rename to annotation-processor/tests/cases/1/output-expected/json/decoding/ConstructorParameterOrderJsonCodec.kt
index e512b0e..c3b8855 100644
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/ConstructorParameterOrderJSONCodec.kt
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/ConstructorParameterOrderJsonCodec.kt
@@ -1,30 +1,30 @@
 package json.decoding
 
 import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONDecoderCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.jvmErasure
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
+import io.fluidsonic.json.AbstractJsonDecoderCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.jvmErasure
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
 import kotlin.String
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
 
-internal object ConstructorParameterOrderJSONCodec :
-		AbstractJSONDecoderCodec<ConstructorParameterOrder, CustomCodingContext>() {
+internal object ConstructorParameterOrderJsonCodec :
+		AbstractJsonDecoderCodec<ConstructorParameterOrder, CustomCodingContext>() {
 	private val constructor: KFunction<ConstructorParameterOrder> =
 			ConstructorParameterOrder::class.constructors.single { constructor ->
 		if (constructor.parameters.size != 3) return@single false
@@ -54,7 +54,7 @@ internal object ConstructorParameterOrderJSONCodec :
 	private val parameter_c: KParameter = constructor.parameters.first { it.name == "c" }
 
 	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<ConstructorParameterOrder>):
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<ConstructorParameterOrder>):
 			ConstructorParameterOrder {
 		val arguments = hashMapOf<KParameter, Any?>()
 		readFromMapByElementValue { key ->
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultAnnotatedConstructorJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultAnnotatedConstructorJSONCodec.kt
deleted file mode 100644
index dc0612b..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultAnnotatedConstructorJSONCodec.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object DefaultAnnotatedConstructorJSONCodec :
-		AbstractJSONCodec<DefaultAnnotatedConstructor, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultAnnotatedConstructor>):
-			DefaultAnnotatedConstructor {
-		var _value = 0L
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readLong()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return DefaultAnnotatedConstructor(
-			value = _value
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DefaultAnnotatedConstructor) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultAnnotatedConstructorJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultAnnotatedConstructorJsonCodec.kt
new file mode 100644
index 0000000..5749614
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultAnnotatedConstructorJsonCodec.kt
@@ -0,0 +1,64 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object DefaultAnnotatedConstructorJsonCodec :
+		AbstractJsonCodec<DefaultAnnotatedConstructor, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultAnnotatedConstructor>):
+			DefaultAnnotatedConstructor {
+		var _value = 0L
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readLong()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return DefaultAnnotatedConstructor(
+			value = _value
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DefaultAnnotatedConstructor) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultObjectJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultObjectJSONCodec.kt
deleted file mode 100644
index 57d5ac2..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultObjectJSONCodec.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONEncoderCodec
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object DefaultObjectJSONCodec : AbstractJSONEncoderCodec<DefaultObject,
-		CustomCodingContext>() {
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DefaultObject) {
-		writeIntoMap {
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultObjectJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultObjectJsonCodec.kt
new file mode 100644
index 0000000..1f8c5c1
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultObjectJsonCodec.kt
@@ -0,0 +1,25 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonEncoderCodec
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object DefaultObjectJsonCodec : AbstractJsonEncoderCodec<DefaultObject,
+		CustomCodingContext>() {
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DefaultObject) {
+		writeIntoMap {
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultPrimaryConstructorJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultPrimaryConstructorJSONCodec.kt
deleted file mode 100644
index 4830f32..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultPrimaryConstructorJSONCodec.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DefaultPrimaryConstructorJSONCodec : AbstractJSONCodec<DefaultPrimaryConstructor,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultPrimaryConstructor>):
-			DefaultPrimaryConstructor {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return DefaultPrimaryConstructor(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DefaultPrimaryConstructor) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultPrimaryConstructorJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultPrimaryConstructorJsonCodec.kt
new file mode 100644
index 0000000..06e1fbd
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultPrimaryConstructorJsonCodec.kt
@@ -0,0 +1,59 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DefaultPrimaryConstructorJsonCodec : AbstractJsonCodec<DefaultPrimaryConstructor,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultPrimaryConstructor>):
+			DefaultPrimaryConstructor {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return DefaultPrimaryConstructor(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DefaultPrimaryConstructor) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryExcludedJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryExcludedJSONCodec.kt
deleted file mode 100644
index 7656c35..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryExcludedJSONCodec.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object DefaultSecondaryConstructorPrimaryExcludedJSONCodec :
-		AbstractJSONCodec<DefaultSecondaryConstructorPrimaryExcluded, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultSecondaryConstructorPrimaryExcluded>):
-			DefaultSecondaryConstructorPrimaryExcluded {
-		var _value = 0
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readInt()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return DefaultSecondaryConstructorPrimaryExcluded(
-			value = _value
-		)
-	}
-
-	override
-			fun JSONEncoder<CustomCodingContext>.encode(value: DefaultSecondaryConstructorPrimaryExcluded) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryExcludedJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryExcludedJsonCodec.kt
new file mode 100644
index 0000000..c73ad1a
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryExcludedJsonCodec.kt
@@ -0,0 +1,65 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object DefaultSecondaryConstructorPrimaryExcludedJsonCodec :
+		AbstractJsonCodec<DefaultSecondaryConstructorPrimaryExcluded, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultSecondaryConstructorPrimaryExcluded>):
+			DefaultSecondaryConstructorPrimaryExcluded {
+		var _value = 0
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readInt()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return DefaultSecondaryConstructorPrimaryExcluded(
+			value = _value
+		)
+	}
+
+	override
+			fun JsonEncoder<CustomCodingContext>.encode(value: DefaultSecondaryConstructorPrimaryExcluded) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryInaccessibleJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryInaccessibleJSONCodec.kt
deleted file mode 100644
index 3816c0f..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryInaccessibleJSONCodec.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object DefaultSecondaryConstructorPrimaryInaccessibleJSONCodec :
-		AbstractJSONCodec<DefaultSecondaryConstructorPrimaryInaccessible, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultSecondaryConstructorPrimaryInaccessible>):
-			DefaultSecondaryConstructorPrimaryInaccessible {
-		var _value = 0
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readInt()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return DefaultSecondaryConstructorPrimaryInaccessible(
-			value = _value
-		)
-	}
-
-	override
-			fun JSONEncoder<CustomCodingContext>.encode(value: DefaultSecondaryConstructorPrimaryInaccessible) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryInaccessibleJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryInaccessibleJsonCodec.kt
new file mode 100644
index 0000000..9c2d79c
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryInaccessibleJsonCodec.kt
@@ -0,0 +1,65 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object DefaultSecondaryConstructorPrimaryInaccessibleJsonCodec :
+		AbstractJsonCodec<DefaultSecondaryConstructorPrimaryInaccessible, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultSecondaryConstructorPrimaryInaccessible>):
+			DefaultSecondaryConstructorPrimaryInaccessible {
+		var _value = 0
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readInt()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return DefaultSecondaryConstructorPrimaryInaccessible(
+			value = _value
+		)
+	}
+
+	override
+			fun JsonEncoder<CustomCodingContext>.encode(value: DefaultSecondaryConstructorPrimaryInaccessible) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryNotPresentJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryNotPresentJSONCodec.kt
deleted file mode 100644
index a13a058..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryNotPresentJSONCodec.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object DefaultSecondaryConstructorPrimaryNotPresentJSONCodec :
-		AbstractJSONCodec<DefaultSecondaryConstructorPrimaryNotPresent, CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultSecondaryConstructorPrimaryNotPresent>):
-			DefaultSecondaryConstructorPrimaryNotPresent {
-		var _value = 0
-		var value_isPresent = false
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" ->  {
-					_value = readInt()
-					value_isPresent = true
-				}
-				else -> skipValue()
-			}
-		}
-
-		value_isPresent || missingPropertyError("value")
-
-		return DefaultSecondaryConstructorPrimaryNotPresent(
-			value = _value
-		)
-	}
-
-	override
-			fun JSONEncoder<CustomCodingContext>.encode(value: DefaultSecondaryConstructorPrimaryNotPresent) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryNotPresentJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryNotPresentJsonCodec.kt
new file mode 100644
index 0000000..76016fa
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/DefaultSecondaryConstructorPrimaryNotPresentJsonCodec.kt
@@ -0,0 +1,65 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object DefaultSecondaryConstructorPrimaryNotPresentJsonCodec :
+		AbstractJsonCodec<DefaultSecondaryConstructorPrimaryNotPresent, CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultSecondaryConstructorPrimaryNotPresent>):
+			DefaultSecondaryConstructorPrimaryNotPresent {
+		var _value = 0
+		var value_isPresent = false
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" ->  {
+					_value = readInt()
+					value_isPresent = true
+				}
+				else -> skipValue()
+			}
+		}
+
+		value_isPresent || missingPropertyError("value")
+
+		return DefaultSecondaryConstructorPrimaryNotPresent(
+			value = _value
+		)
+	}
+
+	override
+			fun JsonEncoder<CustomCodingContext>.encode(value: DefaultSecondaryConstructorPrimaryNotPresent) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/NoneJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/NoneJSONCodec.kt
deleted file mode 100644
index 21ce5e0..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/NoneJSONCodec.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONEncoderCodec
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object NoneJSONCodec : AbstractJSONEncoderCodec<None, CustomCodingContext>() {
-	override fun JSONEncoder<CustomCodingContext>.encode(value: None) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/NoneJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/NoneJsonCodec.kt
new file mode 100644
index 0000000..7eb8973
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/NoneJsonCodec.kt
@@ -0,0 +1,25 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonEncoderCodec
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object NoneJsonCodec : AbstractJsonEncoderCodec<None, CustomCodingContext>() {
+	override fun JsonEncoder<CustomCodingContext>.encode(value: None) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/PrimaryConstructorJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/PrimaryConstructorJSONCodec.kt
deleted file mode 100644
index a53ef0f..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/decoding/PrimaryConstructorJSONCodec.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package json.decoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object PrimaryConstructorJSONCodec : AbstractJSONCodec<PrimaryConstructor,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<PrimaryConstructor>):
-			PrimaryConstructor {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return PrimaryConstructor(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: PrimaryConstructor) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/decoding/PrimaryConstructorJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/decoding/PrimaryConstructorJsonCodec.kt
new file mode 100644
index 0000000..9509281
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/decoding/PrimaryConstructorJsonCodec.kt
@@ -0,0 +1,59 @@
+package json.decoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object PrimaryConstructorJsonCodec : AbstractJsonCodec<PrimaryConstructor,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<PrimaryConstructor>):
+			PrimaryConstructor {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return PrimaryConstructor(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: PrimaryConstructor) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/AllPropertiesJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/AllPropertiesJSONCodec.kt
deleted file mode 100644
index a0a8ae5..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/encoding/AllPropertiesJSONCodec.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package json.encoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import json.encoding.value9
-import kotlin.String
-
-internal object AllPropertiesJSONCodec : AbstractJSONCodec<AllProperties, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AllProperties>):
-			AllProperties {
-		var _value1: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value1" -> _value1 = readString()
-				else -> skipValue()
-			}
-		}
-
-		return AllProperties(
-			value1 = _value1 ?: missingPropertyError("value1")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AllProperties) {
-		writeIntoMap {
-			writeMapElement("value1", string = value.value1)
-			writeMapElement("value2", string = value.value2)
-			writeMapElement("value5", string = value.value5)
-			writeMapElement("value6", string = value.value6)
-			writeMapElement("value9", string = value.value9)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/AllPropertiesJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/AllPropertiesJsonCodec.kt
new file mode 100644
index 0000000..631fa00
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/encoding/AllPropertiesJsonCodec.kt
@@ -0,0 +1,62 @@
+package json.encoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import json.encoding.value9
+import kotlin.String
+
+internal object AllPropertiesJsonCodec : AbstractJsonCodec<AllProperties, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AllProperties>):
+			AllProperties {
+		var _value1: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value1" -> _value1 = readString()
+				else -> skipValue()
+			}
+		}
+
+		return AllProperties(
+			value1 = _value1 ?: missingPropertyError("value1")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AllProperties) {
+		writeIntoMap {
+			writeMapElement("value1", string = value.value1)
+			writeMapElement("value2", string = value.value2)
+			writeMapElement("value5", string = value.value5)
+			writeMapElement("value6", string = value.value6)
+			writeMapElement("value9", string = value.value9)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/AnnotatedPropertiesJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/AnnotatedPropertiesJSONCodec.kt
deleted file mode 100644
index cc7b96f..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/encoding/AnnotatedPropertiesJSONCodec.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package json.encoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import json.encoding.value9
-import kotlin.String
-
-internal object AnnotatedPropertiesJSONCodec : AbstractJSONCodec<AnnotatedProperties,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AnnotatedProperties>):
-			AnnotatedProperties {
-		var _value1: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value1" -> _value1 = readString()
-				else -> skipValue()
-			}
-		}
-
-		return AnnotatedProperties(
-			value1 = _value1 ?: missingPropertyError("value1")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AnnotatedProperties) {
-		writeIntoMap {
-			writeMapElement("value3", string = value.value3)
-			writeMapElement("value6", string = value.value6)
-			writeMapElement("value9", string = value.value9)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/AnnotatedPropertiesJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/AnnotatedPropertiesJsonCodec.kt
new file mode 100644
index 0000000..32b5ce6
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/encoding/AnnotatedPropertiesJsonCodec.kt
@@ -0,0 +1,62 @@
+package json.encoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import json.encoding.value9
+import kotlin.String
+
+internal object AnnotatedPropertiesJsonCodec : AbstractJsonCodec<AnnotatedProperties,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AnnotatedProperties>):
+			AnnotatedProperties {
+		var _value1: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value1" -> _value1 = readString()
+				else -> skipValue()
+			}
+		}
+
+		return AnnotatedProperties(
+			value1 = _value1 ?: missingPropertyError("value1")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AnnotatedProperties) {
+		writeIntoMap {
+			writeMapElement("value3", string = value.value3)
+			writeMapElement("value6", string = value.value6)
+			writeMapElement("value9", string = value.value9)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/AutomaticJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/AutomaticJSONCodec.kt
deleted file mode 100644
index ecbd69a..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/encoding/AutomaticJSONCodec.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package json.encoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import json.encoding.value9
-import kotlin.String
-
-internal object AutomaticJSONCodec : AbstractJSONCodec<Automatic, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Automatic>):
-			Automatic {
-		var _value1: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value1" -> _value1 = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Automatic(
-			value1 = _value1 ?: missingPropertyError("value1")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Automatic) {
-		writeIntoMap {
-			writeMapElement("value1", string = value.value1)
-			writeMapElement("value2", string = value.value2)
-			writeMapElement("value6", string = value.value6)
-			writeMapElement("value9", string = value.value9)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/AutomaticJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/AutomaticJsonCodec.kt
new file mode 100644
index 0000000..2a99a53
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/encoding/AutomaticJsonCodec.kt
@@ -0,0 +1,61 @@
+package json.encoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import json.encoding.value9
+import kotlin.String
+
+internal object AutomaticJsonCodec : AbstractJsonCodec<Automatic, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Automatic>):
+			Automatic {
+		var _value1: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value1" -> _value1 = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Automatic(
+			value1 = _value1 ?: missingPropertyError("value1")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Automatic) {
+		writeIntoMap {
+			writeMapElement("value1", string = value.value1)
+			writeMapElement("value2", string = value.value2)
+			writeMapElement("value6", string = value.value6)
+			writeMapElement("value9", string = value.value9)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/DefaultJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/DefaultJSONCodec.kt
deleted file mode 100644
index 3df53c6..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/encoding/DefaultJSONCodec.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package json.encoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import json.encoding.value9
-import kotlin.String
-
-internal object DefaultJSONCodec : AbstractJSONCodec<Default, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Default>): Default {
-		var _value1: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value1" -> _value1 = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Default(
-			value1 = _value1 ?: missingPropertyError("value1")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Default) {
-		writeIntoMap {
-			writeMapElement("value1", string = value.value1)
-			writeMapElement("value2", string = value.value2)
-			writeMapElement("value6", string = value.value6)
-			writeMapElement("value9", string = value.value9)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/DefaultJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/DefaultJsonCodec.kt
new file mode 100644
index 0000000..a53a784
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/encoding/DefaultJsonCodec.kt
@@ -0,0 +1,60 @@
+package json.encoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import json.encoding.value9
+import kotlin.String
+
+internal object DefaultJsonCodec : AbstractJsonCodec<Default, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Default>): Default {
+		var _value1: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value1" -> _value1 = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Default(
+			value1 = _value1 ?: missingPropertyError("value1")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Default) {
+		writeIntoMap {
+			writeMapElement("value1", string = value.value1)
+			writeMapElement("value2", string = value.value2)
+			writeMapElement("value6", string = value.value6)
+			writeMapElement("value9", string = value.value9)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/NoneJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/NoneJSONCodec.kt
deleted file mode 100644
index 3d9552e..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/encoding/NoneJSONCodec.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package json.encoding
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONDecoderCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import kotlin.String
-
-internal object NoneJSONCodec : AbstractJSONDecoderCodec<None, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<None>): None {
-		var _value1: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value1" -> _value1 = readString()
-				else -> skipValue()
-			}
-		}
-
-		return None(
-			value1 = _value1 ?: missingPropertyError("value1")
-		)
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/encoding/NoneJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/encoding/NoneJsonCodec.kt
new file mode 100644
index 0000000..77e5f4b
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/encoding/NoneJsonCodec.kt
@@ -0,0 +1,37 @@
+package json.encoding
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonDecoderCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import kotlin.String
+
+internal object NoneJsonCodec : AbstractJsonDecoderCodec<None, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<None>): None {
+		var _value1: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value1" -> _value1 = readString()
+				else -> skipValue()
+			}
+		}
+
+		return None(
+			value1 = _value1 ?: missingPropertyError("value1")
+		)
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticSingleValueJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticSingleValueJSONCodec.kt
deleted file mode 100644
index 2ecc2e1..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticSingleValueJSONCodec.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object AutomaticSingleValueJSONCodec : AbstractJSONCodec<AutomaticSingleValue,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticSingleValue>):
-			AutomaticSingleValue = AutomaticSingleValue(value = readString())
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticSingleValue) {
-		writeString(value.value)
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticSingleValueJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticSingleValueJsonCodec.kt
new file mode 100644
index 0000000..58d2f74
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticSingleValueJsonCodec.kt
@@ -0,0 +1,29 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object AutomaticSingleValueJsonCodec : AbstractJsonCodec<AutomaticSingleValue,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticSingleValue>):
+			AutomaticSingleValue = AutomaticSingleValue(value = readString())
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticSingleValue) {
+		writeString(value.value)
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticStructuredJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticStructuredJSONCodec.kt
deleted file mode 100644
index f83b6d7..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticStructuredJSONCodec.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object AutomaticStructuredJSONCodec : AbstractJSONCodec<AutomaticStructured,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticStructured>):
-			AutomaticStructured {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return AutomaticStructured(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticStructured) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticStructuredJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticStructuredJsonCodec.kt
new file mode 100644
index 0000000..dca85a9
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/AutomaticStructuredJsonCodec.kt
@@ -0,0 +1,59 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object AutomaticStructuredJsonCodec : AbstractJsonCodec<AutomaticStructured,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticStructured>):
+			AutomaticStructured {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return AutomaticStructured(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticStructured) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultSingleValueJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultSingleValueJSONCodec.kt
deleted file mode 100644
index f62dab9..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultSingleValueJSONCodec.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DefaultSingleValueJSONCodec : AbstractJSONCodec<DefaultSingleValue,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultSingleValue>):
-			DefaultSingleValue {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return DefaultSingleValue(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DefaultSingleValue) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultSingleValueJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultSingleValueJsonCodec.kt
new file mode 100644
index 0000000..7067435
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultSingleValueJsonCodec.kt
@@ -0,0 +1,59 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DefaultSingleValueJsonCodec : AbstractJsonCodec<DefaultSingleValue,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultSingleValue>):
+			DefaultSingleValue {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return DefaultSingleValue(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DefaultSingleValue) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultStructuredJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultStructuredJSONCodec.kt
deleted file mode 100644
index bd967f5..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultStructuredJSONCodec.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DefaultStructuredJSONCodec : AbstractJSONCodec<DefaultStructured,
-		CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<DefaultStructured>):
-			DefaultStructured {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return DefaultStructured(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: DefaultStructured) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultStructuredJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultStructuredJsonCodec.kt
new file mode 100644
index 0000000..4fb6f9d
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/DefaultStructuredJsonCodec.kt
@@ -0,0 +1,58 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DefaultStructuredJsonCodec : AbstractJsonCodec<DefaultStructured,
+		CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<DefaultStructured>):
+			DefaultStructured {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return DefaultStructured(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: DefaultStructured) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueGenericJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueGenericJSONCodec.kt
deleted file mode 100644
index 0c668ac..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueGenericJSONCodec.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object SingleValueGenericJSONCodec : AbstractJSONCodec<SingleValueGeneric<*>,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<SingleValueGeneric<*>>):
-			SingleValueGeneric<*> = SingleValueGeneric(value = readValueOfTypeOrNull(valueType.arguments[0])
-			as SingleValueGeneric.Bound?)
-	override fun JSONEncoder<CustomCodingContext>.encode(value: SingleValueGeneric<*>) {
-		writeValueOrNull(value.value)
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueGenericJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueGenericJsonCodec.kt
new file mode 100644
index 0000000..405195f
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueGenericJsonCodec.kt
@@ -0,0 +1,30 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object SingleValueGenericJsonCodec : AbstractJsonCodec<SingleValueGeneric<*>,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<SingleValueGeneric<*>>):
+			SingleValueGeneric<*> = SingleValueGeneric(value = readValueOfTypeOrNull(valueType.arguments[0])
+			as SingleValueGeneric.Bound?)
+	override fun JsonEncoder<CustomCodingContext>.encode(value: SingleValueGeneric<*>) {
+		writeValueOrNull(value.value)
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueJSONCodec.kt
deleted file mode 100644
index 461456b..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueJSONCodec.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object SingleValueJSONCodec : AbstractJSONCodec<SingleValue, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<SingleValue>):
-			SingleValue = SingleValue(value = readString())
-	override fun JSONEncoder<CustomCodingContext>.encode(value: SingleValue) {
-		writeString(value.value)
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueJsonCodec.kt
new file mode 100644
index 0000000..6729a63
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueJsonCodec.kt
@@ -0,0 +1,27 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object SingleValueJsonCodec : AbstractJsonCodec<SingleValue, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<SingleValue>):
+			SingleValue = SingleValue(value = readString())
+	override fun JsonEncoder<CustomCodingContext>.encode(value: SingleValue) {
+		writeString(value.value)
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueNullableJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueNullableJSONCodec.kt
deleted file mode 100644
index 94a4ca6..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueNullableJSONCodec.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-
-internal object SingleValueNullableJSONCodec : AbstractJSONCodec<SingleValueNullable,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<SingleValueNullable>):
-			SingleValueNullable = SingleValueNullable(value = readValueOfTypeOrNull())
-	override fun JSONEncoder<CustomCodingContext>.encode(value: SingleValueNullable) {
-		writeValueOrNull(value.value)
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueNullableJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueNullableJsonCodec.kt
new file mode 100644
index 0000000..29de6eb
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/SingleValueNullableJsonCodec.kt
@@ -0,0 +1,29 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeValueOrNull
+
+internal object SingleValueNullableJsonCodec : AbstractJsonCodec<SingleValueNullable,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<SingleValueNullable>):
+			SingleValueNullable = SingleValueNullable(value = readValueOfTypeOrNull())
+	override fun JsonEncoder<CustomCodingContext>.encode(value: SingleValueNullable) {
+		writeValueOrNull(value.value)
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredJSONCodec.kt
deleted file mode 100644
index 09b5c8e..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object StructuredJSONCodec : AbstractJSONCodec<Structured, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Structured>):
-			Structured {
-		var _value: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Structured(
-			value = _value ?: missingPropertyError("value")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Structured) {
-		writeIntoMap {
-			writeMapElement("value", string = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredJsonCodec.kt
new file mode 100644
index 0000000..27c3726
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredJsonCodec.kt
@@ -0,0 +1,57 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object StructuredJsonCodec : AbstractJsonCodec<Structured, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Structured>):
+			Structured {
+		var _value: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Structured(
+			value = _value ?: missingPropertyError("value")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Structured) {
+		writeIntoMap {
+			writeMapElement("value", string = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredValueGenericJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredValueGenericJSONCodec.kt
deleted file mode 100644
index baccad4..0000000
--- a/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredValueGenericJSONCodec.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package json.representation
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.Any
-
-internal object StructuredValueGenericJSONCodec : AbstractJSONCodec<StructuredValueGeneric<*>,
-		CustomCodingContext>() {
-	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<StructuredValueGeneric<*>>):
-			StructuredValueGeneric<*> {
-		var _value: Any? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value" -> _value = readValueOfTypeOrNull(valueType.arguments[0])
-				else -> skipValue()
-			}
-		}
-
-		return StructuredValueGeneric(
-			value = _value
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: StructuredValueGeneric<*>) {
-		writeIntoMap {
-			writeMapElement("value", value = value.value)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredValueGenericJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredValueGenericJsonCodec.kt
new file mode 100644
index 0000000..f5392bb
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/json/representation/StructuredValueGenericJsonCodec.kt
@@ -0,0 +1,59 @@
+package json.representation
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.Any
+
+internal object StructuredValueGenericJsonCodec : AbstractJsonCodec<StructuredValueGeneric<*>,
+		CustomCodingContext>() {
+	override
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<StructuredValueGeneric<*>>):
+			StructuredValueGeneric<*> {
+		var _value: Any? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value" -> _value = readValueOfTypeOrNull(valueType.arguments[0])
+				else -> skipValue()
+			}
+		}
+
+		return StructuredValueGeneric(
+			value = _value
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: StructuredValueGeneric<*>) {
+		writeIntoMap {
+			writeMapElement("value", value = value.value)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticGenericJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticGenericJsonCodec.kt
similarity index 58%
rename from annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticGenericJSONCodec.kt
rename to annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticGenericJsonCodec.kt
index f4041d6..c0106c8 100644
--- a/annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticGenericJSONCodec.kt
+++ b/annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticGenericJsonCodec.kt
@@ -1,41 +1,41 @@
 package property.defaultValue
 
 import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.jvmErasure
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.jvmErasure
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
 
-internal object AutomaticGenericJSONCodec : AbstractJSONCodec<AutomaticGeneric<*>,
+internal object AutomaticGenericJsonCodec : AbstractJsonCodec<AutomaticGeneric<*>,
 		CustomCodingContext>() {
 	private val constructor: KFunction<AutomaticGeneric<*>> =
 			AutomaticGeneric::class.constructors.single { constructor ->
@@ -70,7 +70,7 @@ internal object AutomaticGenericJSONCodec : AbstractJSONCodec<AutomaticGeneric<*
 	private val parameter_value4: KParameter = constructor.parameters.first { it.name == "value4" }
 
 	override
-			fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<AutomaticGeneric<*>>):
+			fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<AutomaticGeneric<*>>):
 			AutomaticGeneric<*> {
 		val arguments = hashMapOf<KParameter, Any?>()
 		readFromMapByElementValue { key ->
@@ -93,7 +93,7 @@ internal object AutomaticGenericJSONCodec : AbstractJSONCodec<AutomaticGeneric<*
 		return constructor.callBy(arguments)
 	}
 
-	override fun JSONEncoder<CustomCodingContext>.encode(value: AutomaticGeneric<*>) {
+	override fun JsonEncoder<CustomCodingContext>.encode(value: AutomaticGeneric<*>) {
 		writeIntoMap {
 			writeMapElement("value1", value = value.value1)
 			writeMapElement("value2", value = value.value2)
diff --git a/annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticJsonCodec.kt
similarity index 70%
rename from annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticJSONCodec.kt
rename to annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticJsonCodec.kt
index 62a0658..3db5947 100644
--- a/annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticJSONCodec.kt
+++ b/annotation-processor/tests/cases/1/output-expected/property/defaultValue/AutomaticJsonCodec.kt
@@ -1,36 +1,36 @@
 package property.defaultValue
 
 import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.jvmErasure
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.jvmErasure
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
 import kotlin.Double
 import kotlin.Int
 import kotlin.String
@@ -39,7 +39,7 @@ import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
 
-internal object AutomaticJSONCodec : AbstractJSONCodec<Automatic, CustomCodingContext>() {
+internal object AutomaticJsonCodec : AbstractJsonCodec<Automatic, CustomCodingContext>() {
 	private val constructor: KFunction<Automatic> =
 			Automatic::class.constructors.single { constructor ->
 		if (constructor.parameters.size != 10) return@single false
@@ -96,7 +96,7 @@ internal object AutomaticJSONCodec : AbstractJSONCodec<Automatic, CustomCodingCo
 
 	private val parameter_value9: KParameter = constructor.parameters.first { it.name == "value9" }
 
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Automatic>):
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Automatic>):
 			Automatic {
 		val arguments = hashMapOf<KParameter, Any?>()
 		readFromMapByElementValue { key ->
@@ -124,7 +124,7 @@ internal object AutomaticJSONCodec : AbstractJSONCodec<Automatic, CustomCodingCo
 		return constructor.callBy(arguments)
 	}
 
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Automatic) {
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Automatic) {
 		writeIntoMap {
 			writeMapElement("value1", string = value.value1)
 			writeMapElement("value10", value = value.value10)
diff --git a/annotation-processor/tests/cases/1/output-expected/property/serializedName/AutomaticJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/property/serializedName/AutomaticJSONCodec.kt
deleted file mode 100644
index b5e6a8c..0000000
--- a/annotation-processor/tests/cases/1/output-expected/property/serializedName/AutomaticJSONCodec.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package property.serializedName
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object AutomaticJSONCodec : AbstractJSONCodec<Automatic, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Automatic>):
-			Automatic {
-		var _value1: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value1" -> _value1 = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Automatic(
-			value1 = _value1 ?: missingPropertyError("value1")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Automatic) {
-		writeIntoMap {
-			writeMapElement("value1", string = value.value1)
-			writeMapElement("value2", string = value.value2)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/property/serializedName/AutomaticJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/property/serializedName/AutomaticJsonCodec.kt
new file mode 100644
index 0000000..8c636a2
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/property/serializedName/AutomaticJsonCodec.kt
@@ -0,0 +1,58 @@
+package property.serializedName
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object AutomaticJsonCodec : AbstractJsonCodec<Automatic, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Automatic>):
+			Automatic {
+		var _value1: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value1" -> _value1 = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Automatic(
+			value1 = _value1 ?: missingPropertyError("value1")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Automatic) {
+		writeIntoMap {
+			writeMapElement("value1", string = value.value1)
+			writeMapElement("value2", string = value.value2)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/property/serializedName/CustomJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/property/serializedName/CustomJSONCodec.kt
deleted file mode 100644
index acdbe38..0000000
--- a/annotation-processor/tests/cases/1/output-expected/property/serializedName/CustomJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package property.serializedName
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object CustomJSONCodec : AbstractJSONCodec<Custom, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Custom>): Custom {
-		var _value1: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"V A L U E 1" -> _value1 = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Custom(
-			value1 = _value1 ?: missingPropertyError("V A L U E 1")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Custom) {
-		writeIntoMap {
-			writeMapElement("V A L U E 1", string = value.value1)
-			writeMapElement("V A L U E 2", string = value.value2)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/property/serializedName/CustomJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/property/serializedName/CustomJsonCodec.kt
new file mode 100644
index 0000000..8b26022
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/property/serializedName/CustomJsonCodec.kt
@@ -0,0 +1,57 @@
+package property.serializedName
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object CustomJsonCodec : AbstractJsonCodec<Custom, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Custom>): Custom {
+		var _value1: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"V A L U E 1" -> _value1 = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Custom(
+			value1 = _value1 ?: missingPropertyError("V A L U E 1")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Custom) {
+		writeIntoMap {
+			writeMapElement("V A L U E 1", string = value.value1)
+			writeMapElement("V A L U E 2", string = value.value2)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/1/output-expected/property/serializedName/DefaultJSONCodec.kt b/annotation-processor/tests/cases/1/output-expected/property/serializedName/DefaultJSONCodec.kt
deleted file mode 100644
index a509a10..0000000
--- a/annotation-processor/tests/cases/1/output-expected/property/serializedName/DefaultJSONCodec.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package property.serializedName
-
-import codecProvider.CustomCodingContext
-import com.github.fluidsonic.fluid.json.AbstractJSONCodec
-import com.github.fluidsonic.fluid.json.JSONCodingType
-import com.github.fluidsonic.fluid.json.JSONDecoder
-import com.github.fluidsonic.fluid.json.JSONEncoder
-import com.github.fluidsonic.fluid.json.missingPropertyError
-import com.github.fluidsonic.fluid.json.readBooleanOrNull
-import com.github.fluidsonic.fluid.json.readByteOrNull
-import com.github.fluidsonic.fluid.json.readCharOrNull
-import com.github.fluidsonic.fluid.json.readDoubleOrNull
-import com.github.fluidsonic.fluid.json.readFloatOrNull
-import com.github.fluidsonic.fluid.json.readFromMapByElementValue
-import com.github.fluidsonic.fluid.json.readIntOrNull
-import com.github.fluidsonic.fluid.json.readLongOrNull
-import com.github.fluidsonic.fluid.json.readShortOrNull
-import com.github.fluidsonic.fluid.json.readStringOrNull
-import com.github.fluidsonic.fluid.json.readValueOfType
-import com.github.fluidsonic.fluid.json.readValueOfTypeOrNull
-import com.github.fluidsonic.fluid.json.writeBooleanOrNull
-import com.github.fluidsonic.fluid.json.writeByteOrNull
-import com.github.fluidsonic.fluid.json.writeCharOrNull
-import com.github.fluidsonic.fluid.json.writeDoubleOrNull
-import com.github.fluidsonic.fluid.json.writeFloatOrNull
-import com.github.fluidsonic.fluid.json.writeIntOrNull
-import com.github.fluidsonic.fluid.json.writeIntoMap
-import com.github.fluidsonic.fluid.json.writeLongOrNull
-import com.github.fluidsonic.fluid.json.writeMapElement
-import com.github.fluidsonic.fluid.json.writeShortOrNull
-import com.github.fluidsonic.fluid.json.writeStringOrNull
-import com.github.fluidsonic.fluid.json.writeValueOrNull
-import kotlin.String
-
-internal object DefaultJSONCodec : AbstractJSONCodec<Default, CustomCodingContext>() {
-	override fun JSONDecoder<CustomCodingContext>.decode(valueType: JSONCodingType<Default>): Default {
-		var _value1: String? = null
-
-		readFromMapByElementValue { key ->
-			when (key) {
-				"value1" -> _value1 = readString()
-				else -> skipValue()
-			}
-		}
-
-		return Default(
-			value1 = _value1 ?: missingPropertyError("value1")
-		)
-	}
-
-	override fun JSONEncoder<CustomCodingContext>.encode(value: Default) {
-		writeIntoMap {
-			writeMapElement("value1", string = value.value1)
-			writeMapElement("value2", string = value.value2)
-		}
-	}
-}
diff --git a/annotation-processor/tests/cases/1/output-expected/property/serializedName/DefaultJsonCodec.kt b/annotation-processor/tests/cases/1/output-expected/property/serializedName/DefaultJsonCodec.kt
new file mode 100644
index 0000000..4b4db4f
--- /dev/null
+++ b/annotation-processor/tests/cases/1/output-expected/property/serializedName/DefaultJsonCodec.kt
@@ -0,0 +1,57 @@
+package property.serializedName
+
+import codecProvider.CustomCodingContext
+import io.fluidsonic.json.AbstractJsonCodec
+import io.fluidsonic.json.JsonCodingType
+import io.fluidsonic.json.JsonDecoder
+import io.fluidsonic.json.JsonEncoder
+import io.fluidsonic.json.missingPropertyError
+import io.fluidsonic.json.readBooleanOrNull
+import io.fluidsonic.json.readByteOrNull
+import io.fluidsonic.json.readCharOrNull
+import io.fluidsonic.json.readDoubleOrNull
+import io.fluidsonic.json.readFloatOrNull
+import io.fluidsonic.json.readFromMapByElementValue
+import io.fluidsonic.json.readIntOrNull
+import io.fluidsonic.json.readLongOrNull
+import io.fluidsonic.json.readShortOrNull
+import io.fluidsonic.json.readStringOrNull
+import io.fluidsonic.json.readValueOfType
+import io.fluidsonic.json.readValueOfTypeOrNull
+import io.fluidsonic.json.writeBooleanOrNull
+import io.fluidsonic.json.writeByteOrNull
+import io.fluidsonic.json.writeCharOrNull
+import io.fluidsonic.json.writeDoubleOrNull
+import io.fluidsonic.json.writeFloatOrNull
+import io.fluidsonic.json.writeIntOrNull
+import io.fluidsonic.json.writeIntoMap
+import io.fluidsonic.json.writeLongOrNull
+import io.fluidsonic.json.writeMapElement
+import io.fluidsonic.json.writeShortOrNull
+import io.fluidsonic.json.writeStringOrNull
+import io.fluidsonic.json.writeValueOrNull
+import kotlin.String
+
+internal object DefaultJsonCodec : AbstractJsonCodec<Default, CustomCodingContext>() {
+	override fun JsonDecoder<CustomCodingContext>.decode(valueType: JsonCodingType<Default>): Default {
+		var _value1: String? = null
+
+		readFromMapByElementValue { key ->
+			when (key) {
+				"value1" -> _value1 = readString()
+				else -> skipValue()
+			}
+		}
+
+		return Default(
+			value1 = _value1 ?: missingPropertyError("value1")
+		)
+	}
+
+	override fun JsonEncoder<CustomCodingContext>.encode(value: Default) {
+		writeIntoMap {
+			writeMapElement("value1", string = value.value1)
+			writeMapElement("value2", string = value.value2)
+		}
+	}
+}
diff --git a/annotation-processor/tests/cases/2/input/codecProvider/StandardContextCodecProvider.kt b/annotation-processor/tests/cases/2/input/codecProvider/StandardContextCodecProvider.kt
index e1b4727..787f532 100644
--- a/annotation-processor/tests/cases/2/input/codecProvider/StandardContextCodecProvider.kt
+++ b/annotation-processor/tests/cases/2/input/codecProvider/StandardContextCodecProvider.kt
@@ -1,7 +1,7 @@
 package codecProvider
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-@JSON.CodecProvider
-interface StandardContextCodecProvider : JSONCodecProvider<JSONCodingContext>
+@Json.CodecProvider
+interface StandardContextCodecProvider : JsonCodecProvider<JsonCodingContext>
diff --git a/annotation-processor/tests/cases/2/output-expected/codecProvider/GeneratedStandardContextCodecProvider.kt b/annotation-processor/tests/cases/2/output-expected/codecProvider/GeneratedStandardContextCodecProvider.kt
index fd49415..3d8151e 100644
--- a/annotation-processor/tests/cases/2/output-expected/codecProvider/GeneratedStandardContextCodecProvider.kt
+++ b/annotation-processor/tests/cases/2/output-expected/codecProvider/GeneratedStandardContextCodecProvider.kt
@@ -1,13 +1,13 @@
 package codecProvider
 
-import com.github.fluidsonic.fluid.json.JSONCodecProvider
-import com.github.fluidsonic.fluid.json.JSONCodingContext
+import io.fluidsonic.json.JsonCodecProvider
+import io.fluidsonic.json.JsonCodingContext
 import kotlin.Suppress
 import kotlin.reflect.KClass
 
 private object GeneratedStandardContextCodecProvider : StandardContextCodecProvider,
-		JSONCodecProvider<JSONCodingContext> by JSONCodecProvider()
+		JsonCodecProvider<JsonCodingContext> by JsonCodecProvider()
 
 @Suppress("UNUSED_PARAMETER")
-fun JSONCodecProvider.Companion.generated(interfaceClass: KClass<StandardContextCodecProvider>):
+fun JsonCodecProvider.Companion.generated(interfaceClass: KClass<StandardContextCodecProvider>):
 		StandardContextCodecProvider = GeneratedStandardContextCodecProvider
diff --git a/annotation-processor/tests/sources/CaseTests.kt b/annotation-processor/tests/sources/CaseTests.kt
index e678026..a81b6b8 100644
--- a/annotation-processor/tests/sources/CaseTests.kt
+++ b/annotation-processor/tests/sources/CaseTests.kt
@@ -1,7 +1,7 @@
 package tests.annotationprocessor
 
-import com.github.fluidsonic.fluid.compiler.*
-import com.github.fluidsonic.fluid.json.annotationprocessor.*
+import io.fluidsonic.compiler.*
+import io.fluidsonic.json.annotationprocessor.*
 import org.jetbrains.kotlin.cli.common.*
 import org.junit.jupiter.api.*
 import java.io.*
diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts
index 3e1522e..eafecbd 100644
--- a/annotations/build.gradle.kts
+++ b/annotations/build.gradle.kts
@@ -1,5 +1,5 @@
-import com.github.fluidsonic.fluid.library.*
+import io.fluidsonic.gradle.*
 
-fluidJvmLibraryVariant {
+fluidJvmLibraryVariant(JvmTarget.jdk7) {
 	description = "A JSON library written in pure Kotlin (annotations)"
 }
diff --git a/annotations/sources/JSON.kt b/annotations/sources/Json.kt
similarity index 73%
rename from annotations/sources/JSON.kt
rename to annotations/sources/Json.kt
index b6f8c30..cf67877 100644
--- a/annotations/sources/JSON.kt
+++ b/annotations/sources/Json.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
-import com.github.fluidsonic.fluid.json.JSON.*
+import io.fluidsonic.json.Json.*
 import kotlin.reflect.*
 
 
 /**
- * Creates a [JSONCodec] for the annotated class.
+ * Creates a [JsonCodec] for the annotated class.
  *
  * Note that there are several limitations which classes can be annotated:
  * - it and all enclosing classes must have `internal` or `public` visibility
@@ -14,16 +14,16 @@ import kotlin.reflect.*
  */
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.CLASS)
-annotation class JSON(
+annotation class Json(
 	/**
 	 * Name of the generated codec class.
 	 *
-	 * By default its name will be derived from the name of the annotated class with `JSONCodec` appended and with the names of enclosing types prepended and
+	 * By default its name will be derived from the name of the annotated class with `JsonCodec` appended and with the names of enclosing types prepended and
 	 * separated by `_`.
 	 *
 	 * ### Examples:
-	 * - `@JSON class Foo` -> `FooJSONCodec`
-	 * - `class Foo { @JSON class Bar }` -> `Foo_BarJSONCodec`
+	 * - `@Json class Foo` -> `FooJsonCodec`
+	 * - `class Foo { @Json class Bar }` -> `Foo_BarJsonCodec`
 	 */
 	val codecName: String = automatic,
 
@@ -63,9 +63,9 @@ annotation class JSON(
 	val representation: Representation = Representation.automatic
 ) {
 	/**
-	 * The annotated constructor of a class annotated with [@JSON][JSON] will be used for decoding instances of the class as JSON even if
-	 * [@JSON.decoding][JSON.decoding] would exclude them by default or if there would be multiple constructors and a decision needs to be made. This does not
-	 * apply if [@JSON.decoding][JSON.decoding] is set to [none][Decoding.none] in which case an error will be raised.
+	 * The annotated constructor of a class annotated with [@Json][Json] will be used for decoding instances of the class as JSON even if
+	 * [@Json.decoding][Json.decoding] would exclude them by default or if there would be multiple constructors and a decision needs to be made. This does not
+	 * apply if [@Json.decoding][Json.decoding] is set to [none][Decoding.none] in which case an error will be raised.
 	 */
 	@Retention(AnnotationRetention.SOURCE)
 	@Target(AnnotationTarget.CONSTRUCTOR)
@@ -73,19 +73,19 @@ annotation class JSON(
 
 
 	/**
-	 * Creates an object implementing the annotated interface which in turn extends [JSONCodecProvider] and no other interfaces. That object can be accessed
-	 * using [`JSONCodecProvider.generated(AnnotatedInterface::class)`][JSONCodecProvider.Companion.generated]. It provides all codecs which have been generated
-	 * using [@JSON][JSON] annotations. The annotated interface also specifies the [JSONCodingContext] type being used by all generated codecs.
+	 * Creates an object implementing the annotated interface which in turn extends [JsonCodecProvider] and no other interfaces. That object can be accessed
+	 * using [`JsonCodecProvider.generated(AnnotatedInterface::class)`][JsonCodecProvider.Companion.generated]. It provides all codecs which have been generated
+	 * using [@Json][Json] annotations. The annotated interface also specifies the [JsonCodingContext] type being used by all generated codecs.
 	 *
 	 * Note that only one codec provider can be created per module and it must not be generic.
 	 *
 	 * ### Example
 	 *
 	 * ```kotlin
-	 * @JSON.CodecProvider
-	 * interface ExampleJSONCodecProvider : JSONCodecProvider<MyCodingContext>
+	 * @Json.CodecProvider
+	 * interface ExampleJsonCodecProvider : JsonCodecProvider<MyCodingContext>
 	 *
-	 * val provider = JSONCodecProvider.generated(ExampleJSONCodecProvider::class)
+	 * val provider = JsonCodecProvider.generated(ExampleJsonCodecProvider::class)
 	 * ```
 	 */
 	@Retention(AnnotationRetention.SOURCE)
@@ -94,18 +94,18 @@ annotation class JSON(
 		/**
 		 * Defines additional types for which codecs should be generated but which are not part of the same module as the annotated interface.
 		 */
-		val externalTypes: Array<JSON.ExternalType> = []
+		val externalTypes: Array<Json.ExternalType> = []
 	)
 
 
 	/**
-	 * By annotating an extension function with this annotation additional code can be executed as part of the encoding of a [@JSON][JSON]-annotated class.
+	 * By annotating an extension function with this annotation additional code can be executed as part of the encoding of a [@Json][Json]-annotated class.
 	 *
-	 * This functionality requires the use of [@JSON.CodecProvider][CodecProvider] within the same module. The extension function must use [JSONEncoder] as
-	 * receiver type with the same context type as the [@JSON.CodecProvider][CodecProvider]-annotated interface or a supertype of that context type.
+	 * This functionality requires the use of [@Json.CodecProvider][CodecProvider] within the same module. The extension function must use [JsonEncoder] as
+	 * receiver type with the same context type as the [@Json.CodecProvider][CodecProvider]-annotated interface or a supertype of that context type.
 	 *
-	 * The annotated extension function must either be a member of the [@JSON][JSON]-annotated class or be defined at file-level and take exactly one value
-	 * parameter of the [@JSON][JSON]-annotated class.
+	 * The annotated extension function must either be a member of the [@Json][Json]-annotated class or be defined at file-level and take exactly one value
+	 * parameter of the [@Json][Json]-annotated class.
 	 *
 	 * Note that the function can have any name, its return value is ignored, it must have `internal` or `public` visibility and it must not be generic.
 	 *
@@ -118,8 +118,8 @@ annotation class JSON(
 	 *     // …
 	 *     val emailAddress: String
 	 * ) {
-	 *     @JSON.CustomProperties
-	 *     fun JSONEncoder<AuthenticationAwareContext>.writeCustomProperties() {
+	 *     @Json.CustomProperties
+	 *     fun JsonEncoder<AuthenticationAwareContext>.writeCustomProperties() {
 	 *         if (this == context.authenticatedUser) {
 	 *             writeMapElement("emailAddress", emailAddress)
 	 *         }
@@ -130,8 +130,8 @@ annotation class JSON(
 	 * #### File-level extension function
 	 *
 	 * ```
-	 * @JSON.CustomProperties
-	 * fun JSONEncoder<AuthenticationAwareContext>.writeCustomProperties(user: User) {
+	 * @Json.CustomProperties
+	 * fun JsonEncoder<AuthenticationAwareContext>.writeCustomProperties(user: User) {
 	 *     if (user == context.authenticatedUser) {
 	 *         writeMapElement("emailAddress", user.emailAddress)
 	 *     }
@@ -144,7 +144,7 @@ annotation class JSON(
 
 
 	/**
-	 * In a class annotated with [@JSON][JSON]
+	 * In a class annotated with [@Json][Json]
 	 * - properties having this annotation will be ignored when encoding instances of that class and
 	 * - constructors having this annotation will be ignored when decoding instances of that class.
 	 */
@@ -154,13 +154,13 @@ annotation class JSON(
 
 
 	/**
-	 * Creates a [JSONCodec] for a class which is not part of the same module and which thus cannot be annotated with [@JSON][JSON].
+	 * Creates a [JsonCodec] for a class which is not part of the same module and which thus cannot be annotated with [@Json][Json].
 	 */
 	@Retention(AnnotationRetention.SOURCE)
 	@Target()
 	annotation class ExternalType(
 		/**
-		 * The class for which a [JSONCodec] should be created.
+		 * The class for which a [JsonCodec] should be created.
 		 *
 		 * **You must also specify [targetName] if the class you reference is an inline class.**
 		 */
@@ -168,12 +168,12 @@ annotation class JSON(
 		val target: KClass<*>,
 
 		/**
-		 * The [@JSON][JSON] annotation as if the [target] class was annotated directly.
+		 * The [@Json][Json] annotation as if the [target] class was annotated directly.
 		 */
-		val configuration: JSON = JSON(),
+		val configuration: Json = Json(),
 
 		/**
-		 * The fully qualified name of the class for which a [JSONCodec] should be created.
+		 * The fully qualified name of the class for which a [JsonCodec] should be created.
 		 *
 		 * **You must specify this property when using this annotation for inline classes.**
 		 *
@@ -184,8 +184,8 @@ annotation class JSON(
 
 
 	/**
-	 * Annotated properties of a class annotated with [@JSON][JSON] will be used for encoding instances of the class as JSON even if
-	 * [@JSON.encoding][JSON.encoding] would exclude them by default. This does not apply if [@JSON.encoding][JSON.encoding] is set to [none][Encoding.none]
+	 * Annotated properties of a class annotated with [@Json][Json] will be used for encoding instances of the class as JSON even if
+	 * [@Json.encoding][Json.encoding] would exclude them by default. This does not apply if [@Json.encoding][Json.encoding] is set to [none][Encoding.none]
 	 * in which case an error will be raised.
 	 *
 	 * This annotation can also be used to further configure how a specific property is being decoded and encoded.
@@ -233,24 +233,24 @@ annotation class JSON(
 
 
 	/**
-	 * The way in which the annotation processor can decode and instantiate a [@JSON][JSON]-annotated class.
+	 * The way in which the annotation processor can decode and instantiate a [@Json][Json]-annotated class.
 	 */
 	enum class Decoding {
 
 		/**
-		 * The constructor annotated with [@JSON.Constructor][Constructor] will be used for decoding and creating instances.
+		 * The constructor annotated with [@Json.Constructor][Constructor] will be used for decoding and creating instances.
 		 *
-		 * If multiple constructors are or no constructor is annotated with [@JSON.Constructor][Constructor] then an error will be raised.
+		 * If multiple constructors are or no constructor is annotated with [@Json.Constructor][Constructor] then an error will be raised.
 		 */
 		annotatedConstructor,
 
 		/**
-		 * The annotation processor will try to find the best way to decode the [@JSON][JSON]-annotated class using the following approaches, in order:
+		 * The annotation processor will try to find the best way to decode the [@Json][Json]-annotated class using the following approaches, in order:
 		 *
 		 * 1. `none` for any `object`
-		 * 2. the constructor annotated with [@JSON.Constructor][Constructor] if present
-		 * 3. the primary constructor if present, accessible and not annotated with [@JSON.Excluded][Excluded]
-		 * 4. a secondary constructor if there is only one accessible and not annotated with [@JSON.Excluded][Excluded]
+		 * 2. the constructor annotated with [@Json.Constructor][Constructor] if present
+		 * 3. the primary constructor if present, accessible and not annotated with [@Json.Excluded][Excluded]
+		 * 4. a secondary constructor if there is only one accessible and not annotated with [@Json.Excluded][Excluded]
 		 *
 		 * Accessible in this case means having `internal` or `public` visibility.
 		 *
@@ -264,14 +264,14 @@ annotation class JSON(
 		/**
 		 * The annotated class is not decodable.
 		 *
-		 * Trying to use [@JSON.Constructor][Constructor] for such a non-decodable class raises an error.
+		 * Trying to use [@Json.Constructor][Constructor] for such a non-decodable class raises an error.
 		 */
 		none,
 
 		/**
 		 * The class' primary constructor will be used for decoding.
 		 *
-		 * If there is no primary constructor, the constructor is not accessible, uses `vararg` or is annotated with [@JSON.Excluded][Excluded] then an error
+		 * If there is no primary constructor, the constructor is not accessible, uses `vararg` or is annotated with [@Json.Excluded][Excluded] then an error
 		 * will be raised.
 		 *
 		 * Accessible in this case means having `internal` or `public` visibility.
@@ -281,35 +281,35 @@ annotation class JSON(
 
 
 	/**
-	 * The way in which the annotation processor can encode a [@JSON][JSON]-annotated class.
+	 * The way in which the annotation processor can encode a [@Json][Json]-annotated class.
 	 */
 	enum class Encoding {
 
 		/**
 		 * All properties defined in the class will be encoded unless either of the following is true:
 		 *
-		 * - property has been excluded using [@JSON.Excluded][Excluded]
+		 * - property has been excluded using [@Json.Excluded][Excluded]
 		 * - property is not accessible
 		 * - property is synthetic
 		 * - property has a receiver parameter
 		 *
 		 * Accessible in this case means having `internal` or `public` visibility.
 		 *
-		 * File-level extension properties will also be included if annotated with [@JSON.Property][Property].
+		 * File-level extension properties will also be included if annotated with [@Json.Property][Property].
 		 *
 		 * If no properties are found then the class will be encoded as an empty object.
 		 */
 		allProperties,
 
 		/**
-		 * Only properties explicitly annotated with [@JSON.Property][Property] will be encoded.
+		 * Only properties explicitly annotated with [@Json.Property][Property] will be encoded.
 		 *
 		 * If no properties are found then the class will be encoded as an empty object.
 		 */
 		annotatedProperties,
 
 		/**
-		 * The annotation processor will try to find the best way to encode the [@JSON][JSON]-annotated class.
+		 * The annotation processor will try to find the best way to encode the [@Json][Json]-annotated class.
 		 *
 		 * This behaves like [allProperties] with the only difference being that properties who have a non-default getter are excluded by default.
 		 */
@@ -318,14 +318,14 @@ annotation class JSON(
 		/**
 		 * The annotated class is not encodable.
 		 *
-		 * Trying to use [@JSON.Property][Property] or [@JSON.CustomProperties][CustomProperties] for such a non-encodable class raises an error.
+		 * Trying to use [@Json.Property][Property] or [@Json.CustomProperties][CustomProperties] for such a non-encodable class raises an error.
 		 */
 		none
 	}
 
 
 	/**
-	 * The way in which the annotation processor will represent a [@JSON][JSON]-annotated class in JSON.
+	 * The way in which the annotation processor will represent a [@Json][Json]-annotated class in JSON.
 	 */
 	enum class Representation {
 
diff --git a/basic/build.gradle.kts b/basic/build.gradle.kts
index 1f5d2d2..7fadfa3 100644
--- a/basic/build.gradle.kts
+++ b/basic/build.gradle.kts
@@ -1,5 +1,5 @@
-import com.github.fluidsonic.fluid.library.*
+import io.fluidsonic.gradle.*
 
-fluidJvmLibraryVariant {
+fluidJvmLibraryVariant(JvmTarget.jdk7) {
 	description = "A JSON library written in pure Kotlin (basic variant)"
 }
diff --git a/basic/sources/JSONDepth.kt b/basic/sources/JSONDepth.kt
deleted file mode 100644
index dc16830..0000000
--- a/basic/sources/JSONDepth.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-inline class JSONDepth(val value: Int) : Comparable<JSONDepth> {
-
-	override operator fun compareTo(other: JSONDepth) =
-		value.compareTo(other.value)
-}
diff --git a/basic/sources/JSONParser.kt b/basic/sources/JSONParser.kt
deleted file mode 100644
index 1bc8a2f..0000000
--- a/basic/sources/JSONParser.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.io.*
-
-
-interface JSONParser {
-
-	fun parseList(source: JSONReader, withTermination: Boolean = true) =
-		parseValueAsType<List<*>>(source, withTermination = withTermination)
-
-
-	fun parseMap(source: JSONReader, withTermination: Boolean = true) =
-		parseValueAsType<Map<String, *>>(source, withTermination = withTermination)
-
-
-	private inline fun <reified ReturnValue> parseValueAsType(source: JSONReader, withTermination: Boolean): ReturnValue {
-		val value = parseValueOrNull(source, withTermination = withTermination)
-		return value as? ReturnValue
-			?: throw JSONException.Schema(
-				message = "Cannot parse ${ReturnValue::class}, got " + value?.let { "${value::class}: $value" },
-				offset = source.offset,
-				path = source.path
-			)
-	}
-
-
-	fun parseValueOrNull(source: JSONReader, withTermination: Boolean = true): Any?
-
-
-	companion object {
-
-		val default: JSONParser get() = StandardParser
-	}
-}
-
-
-fun JSONParser.parseList(source: Reader, withTermination: Boolean = true) =
-	parseList(JSONReader.build(source), withTermination = withTermination)
-
-
-fun JSONParser.parseList(source: String) =
-	parseList(JSONReader.build(source))
-
-
-fun JSONParser.parseMap(source: Reader, withTermination: Boolean = true) =
-	parseMap(JSONReader.build(source), withTermination = withTermination)
-
-
-fun JSONParser.parseMap(source: String) =
-	parseMap(JSONReader.build(source))
-
-
-fun JSONParser.parseValue(source: JSONReader, withTermination: Boolean = true) =
-	parseValueOrNull(source, withTermination = withTermination) ?: throw JSONException.Schema("Unexpected null value at top-level")
-
-
-fun JSONParser.parseValue(source: Reader, withTermination: Boolean = true) =
-	parseValue(JSONReader.build(source), withTermination = withTermination)
-
-
-fun JSONParser.parseValue(source: String) =
-	parseValue(JSONReader.build(source))
-
-
-fun JSONParser.parseValueOrNull(source: Reader, withTermination: Boolean = true) =
-	parseValueOrNull(JSONReader.build(source), withTermination = withTermination)
-
-
-fun JSONParser.parseValueOrNull(source: String) =
-	parseValueOrNull(JSONReader.build(source))
diff --git a/basic/sources/JSONSerializer.kt b/basic/sources/JSONSerializer.kt
deleted file mode 100644
index 61ef8c1..0000000
--- a/basic/sources/JSONSerializer.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.io.*
-
-
-interface JSONSerializer {
-
-	fun serializeValue(value: Any?, destination: JSONWriter, withTermination: Boolean = true)
-
-
-	companion object {
-
-		val default: JSONSerializer get() = StandardSerializer
-	}
-}
-
-
-fun JSONSerializer.serializeValue(value: Any?) =
-	StringWriter().apply { serializeValue(value, destination = this) }.toString()
-
-
-fun JSONSerializer.serializeValue(value: Any?, destination: Writer, withTermination: Boolean = true) =
-	serializeValue(value, destination = JSONWriter.build(destination), withTermination = withTermination)
diff --git a/basic/sources/JsonDepth.kt b/basic/sources/JsonDepth.kt
new file mode 100644
index 0000000..c1df8e6
--- /dev/null
+++ b/basic/sources/JsonDepth.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+inline class JsonDepth(val value: Int) : Comparable<JsonDepth> {
+
+	override operator fun compareTo(other: JsonDepth) =
+		value.compareTo(other.value)
+}
diff --git a/basic/sources/JSONException.kt b/basic/sources/JsonException.kt
similarity index 67%
rename from basic/sources/JSONException.kt
rename to basic/sources/JsonException.kt
index dd34c3f..a1d1a49 100644
--- a/basic/sources/JSONException.kt
+++ b/basic/sources/JsonException.kt
@@ -1,10 +1,10 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-abstract class JSONException(
+abstract class JsonException(
 	message: String,
 	val offset: Int = -1,
-	val path: JSONPath? = null,
+	val path: JsonPath? = null,
 	cause: Throwable? = null
 ) : RuntimeException(message, cause) {
 
@@ -21,7 +21,7 @@ abstract class JSONException(
 		private fun buildMessage(
 			message: String,
 			offset: Int,
-			path: JSONPath?
+			path: JsonPath?
 		) = buildString {
 			if (path != null) {
 				append("at ")
@@ -42,9 +42,9 @@ abstract class JSONException(
 	class Parsing(
 		message: String,
 		offset: Int = -1,
-		path: JSONPath? = null,
+		path: JsonPath? = null,
 		cause: Throwable? = null
-	) : JSONException(message = message, offset = offset, path = path, cause = cause) {
+	) : JsonException(message = message, offset = offset, path = path, cause = cause) {
 
 		companion object
 	}
@@ -53,9 +53,9 @@ abstract class JSONException(
 	class Schema(
 		message: String,
 		offset: Int = -1,
-		path: JSONPath? = null,
+		path: JsonPath? = null,
 		cause: Throwable? = null
-	) : JSONException(message = message, offset = offset, path = path, cause = cause) {
+	) : JsonException(message = message, offset = offset, path = path, cause = cause) {
 
 		companion object
 	}
@@ -63,9 +63,9 @@ abstract class JSONException(
 
 	class Serialization(
 		message: String,
-		path: JSONPath? = null,
+		path: JsonPath? = null,
 		cause: Throwable? = null
-	) : JSONException(message = message, path = path, cause = cause) {
+	) : JsonException(message = message, path = path, cause = cause) {
 
 		companion object
 	}
@@ -74,9 +74,9 @@ abstract class JSONException(
 	class Syntax(
 		message: String,
 		offset: Int = -1,
-		path: JSONPath? = null,
+		path: JsonPath? = null,
 		cause: Throwable? = null
-	) : JSONException(message = message, offset = offset, path = path, cause = cause) {
+	) : JsonException(message = message, offset = offset, path = path, cause = cause) {
 
 		companion object
 	}
diff --git a/basic/sources/JsonParser.kt b/basic/sources/JsonParser.kt
new file mode 100644
index 0000000..ef7904f
--- /dev/null
+++ b/basic/sources/JsonParser.kt
@@ -0,0 +1,70 @@
+package io.fluidsonic.json
+
+import java.io.*
+
+
+interface JsonParser {
+
+	fun parseList(source: JsonReader, withTermination: Boolean = true) =
+		parseValueAsType<List<*>>(source, withTermination = withTermination)
+
+
+	fun parseMap(source: JsonReader, withTermination: Boolean = true) =
+		parseValueAsType<Map<String, *>>(source, withTermination = withTermination)
+
+
+	private inline fun <reified ReturnValue> parseValueAsType(source: JsonReader, withTermination: Boolean): ReturnValue {
+		val value = parseValueOrNull(source, withTermination = withTermination)
+		return value as? ReturnValue
+			?: throw JsonException.Schema(
+				message = "Cannot parse ${ReturnValue::class}, got " + value?.let { "${value::class}: $value" },
+				offset = source.offset,
+				path = source.path
+			)
+	}
+
+
+	fun parseValueOrNull(source: JsonReader, withTermination: Boolean = true): Any?
+
+
+	companion object {
+
+		val default: JsonParser get() = StandardParser
+	}
+}
+
+
+fun JsonParser.parseList(source: Reader, withTermination: Boolean = true) =
+	parseList(JsonReader.build(source), withTermination = withTermination)
+
+
+fun JsonParser.parseList(source: String) =
+	parseList(JsonReader.build(source))
+
+
+fun JsonParser.parseMap(source: Reader, withTermination: Boolean = true) =
+	parseMap(JsonReader.build(source), withTermination = withTermination)
+
+
+fun JsonParser.parseMap(source: String) =
+	parseMap(JsonReader.build(source))
+
+
+fun JsonParser.parseValue(source: JsonReader, withTermination: Boolean = true) =
+	parseValueOrNull(source, withTermination = withTermination) ?: throw JsonException.Schema("Unexpected null value at top-level")
+
+
+fun JsonParser.parseValue(source: Reader, withTermination: Boolean = true) =
+	parseValue(JsonReader.build(source), withTermination = withTermination)
+
+
+fun JsonParser.parseValue(source: String) =
+	parseValue(JsonReader.build(source))
+
+
+fun JsonParser.parseValueOrNull(source: Reader, withTermination: Boolean = true) =
+	parseValueOrNull(JsonReader.build(source), withTermination = withTermination)
+
+
+fun JsonParser.parseValueOrNull(source: String) =
+	parseValueOrNull(JsonReader.build(source))
diff --git a/basic/sources/JSONPath.kt b/basic/sources/JsonPath.kt
similarity index 83%
rename from basic/sources/JSONPath.kt
rename to basic/sources/JsonPath.kt
index 567e95a..da7fa00 100644
--- a/basic/sources/JSONPath.kt
+++ b/basic/sources/JsonPath.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-class JSONPath(elements: List<Element> = emptyList()) {
+class JsonPath(elements: List<Element> = emptyList()) {
 
 	val elements = elements.toList()
 
-	override fun equals(other: Any?) = (this === other || (other is JSONPath && elements == other.elements))
+	override fun equals(other: Any?) = (this === other || (other is JsonPath && elements == other.elements))
 	override fun hashCode() = elements.hashCode()
 
 	override fun toString() =
@@ -17,7 +17,7 @@ class JSONPath(elements: List<Element> = emptyList()) {
 
 	companion object {
 
-		val root = JSONPath()
+		val root = JsonPath()
 	}
 
 
diff --git a/basic/sources/JSONReader.kt b/basic/sources/JsonReader.kt
similarity index 66%
rename from basic/sources/JSONReader.kt
rename to basic/sources/JsonReader.kt
index 6cd4819..77846de 100644
--- a/basic/sources/JSONReader.kt
+++ b/basic/sources/JsonReader.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.io.*
 
@@ -7,16 +7,16 @@ import java.io.*
 // - https://youtrack.jetbrains.com/issue/KT-29614
 
 
-interface JSONReader : Closeable {
+interface JsonReader : Closeable {
 
-	val depth: JSONDepth
+	val depth: JsonDepth
 	val isInValueIsolation: Boolean
-	val nextToken: JSONToken?
+	val nextToken: JsonToken?
 	val offset: Int
-	val path: JSONPath
+	val path: JsonPath
 
-	fun beginValueIsolation(): JSONDepth
-	fun endValueIsolation(depth: JSONDepth)
+	fun beginValueIsolation(): JsonDepth
+	fun endValueIsolation(depth: JsonDepth)
 	fun readBoolean(): Boolean
 	fun readDouble(): Double
 	fun readListEnd()
@@ -42,7 +42,7 @@ interface JSONReader : Closeable {
 
 	fun readChar(): Char {
 		val value = readString()
-		if (value.length != 1) throw JSONException.Schema(
+		if (value.length != 1) throw JsonException.Schema(
 			message = "Expected value to be a string of exactly one UTF-16 character",
 			path = path
 		)
@@ -82,13 +82,13 @@ interface JSONReader : Closeable {
 	fun readValue(): Any {
 		val token = nextToken
 		return when (token) {
-			JSONToken.booleanValue -> readBoolean()
-			JSONToken.listStart -> readList()
-			JSONToken.mapKey -> readMapKey()
-			JSONToken.mapStart -> readMap()
-			JSONToken.numberValue -> readNumber()
-			JSONToken.stringValue -> readString()
-			else -> throw JSONException.Parsing(
+			JsonToken.booleanValue -> readBoolean()
+			JsonToken.listStart -> readList()
+			JsonToken.mapKey -> readMapKey()
+			JsonToken.mapStart -> readMap()
+			JsonToken.numberValue -> readNumber()
+			JsonToken.stringValue -> readString()
+			else -> throw JsonException.Parsing(
 				message = "Cannot read value. Current token is '$token'",
 				offset = offset,
 				path = path
@@ -100,14 +100,14 @@ interface JSONReader : Closeable {
 	fun skipValue() {
 		val token = nextToken
 		when (token) {
-			JSONToken.booleanValue -> readBoolean()
-			JSONToken.listStart -> readListByElement { skipValue() }
-			JSONToken.mapKey -> readMapKey()
-			JSONToken.mapStart -> readMapByElementValue { skipValue() }
-			JSONToken.nullValue -> readNull()
-			JSONToken.numberValue -> readNumber()
-			JSONToken.stringValue -> readString()
-			else -> throw JSONException.Parsing(
+			JsonToken.booleanValue -> readBoolean()
+			JsonToken.listStart -> readListByElement { skipValue() }
+			JsonToken.mapKey -> readMapKey()
+			JsonToken.mapStart -> readMapByElementValue { skipValue() }
+			JsonToken.nullValue -> readNull()
+			JsonToken.numberValue -> readNumber()
+			JsonToken.stringValue -> readString()
+			else -> throw JsonException.Parsing(
 				message = "Cannot skip value if next token is '$token'",
 				offset = offset,
 				path = path
@@ -118,7 +118,7 @@ interface JSONReader : Closeable {
 
 	companion object {
 
-		fun build(source: Reader): JSONReader =
+		fun build(source: Reader): JsonReader =
 			StandardReader(TextInput(source))
 
 
@@ -128,7 +128,7 @@ interface JSONReader : Closeable {
 }
 
 
-inline fun <Reader : JSONReader, Value> Reader.isolateValueRead(crossinline read: Reader.() -> Value): Value {
+inline fun <Reader : JsonReader, Value> Reader.isolateValueRead(crossinline read: Reader.() -> Value): Value {
 	val depth = beginValueIsolation()
 	val value = read()
 	endValueIsolation(depth = depth)
@@ -137,31 +137,31 @@ inline fun <Reader : JSONReader, Value> Reader.isolateValueRead(crossinline read
 }
 
 
-fun JSONReader.readBooleanOrNull() =
-	if (nextToken != JSONToken.nullValue) readBoolean() else readNull()
+fun JsonReader.readBooleanOrNull() =
+	if (nextToken != JsonToken.nullValue) readBoolean() else readNull()
 
 
-fun JSONReader.readByteOrNull() =
-	if (nextToken != JSONToken.nullValue) readByte() else readNull()
+fun JsonReader.readByteOrNull() =
+	if (nextToken != JsonToken.nullValue) readByte() else readNull()
 
 
-fun JSONReader.readCharOrNull() =
-	if (nextToken != JSONToken.nullValue) readChar() else readNull()
+fun JsonReader.readCharOrNull() =
+	if (nextToken != JsonToken.nullValue) readChar() else readNull()
 
 
-fun JSONReader.readDoubleOrNull() =
-	if (nextToken != JSONToken.nullValue) readDouble() else readNull()
+fun JsonReader.readDoubleOrNull() =
+	if (nextToken != JsonToken.nullValue) readDouble() else readNull()
 
 
-fun JSONReader.readFloatOrNull() =
-	if (nextToken != JSONToken.nullValue) readFloat() else readNull()
+fun JsonReader.readFloatOrNull() =
+	if (nextToken != JsonToken.nullValue) readFloat() else readNull()
 
 
-fun JSONReader.readIntOrNull() =
-	if (nextToken != JSONToken.nullValue) readInt() else readNull()
+fun JsonReader.readIntOrNull() =
+	if (nextToken != JsonToken.nullValue) readInt() else readNull()
 
 
-inline fun <Reader : JSONReader, Value> Reader.readFromList(crossinline readContent: Reader.() -> Value): Value {
+inline fun <Reader : JsonReader, Value> Reader.readFromList(crossinline readContent: Reader.() -> Value): Value {
 //	contract {
 //		callsInPlace(readContent, InvocationKind.EXACTLY_ONCE)
 //	}
@@ -173,7 +173,7 @@ inline fun <Reader : JSONReader, Value> Reader.readFromList(crossinline readCont
 }
 
 
-inline fun <Reader : JSONReader, Value> Reader.readFromMap(crossinline readContent: Reader.() -> Value): Value {
+inline fun <Reader : JsonReader, Value> Reader.readFromMap(crossinline readContent: Reader.() -> Value): Value {
 //	contract {
 //		callsInPlace(readContent, InvocationKind.EXACTLY_ONCE)
 //	}
@@ -185,32 +185,32 @@ inline fun <Reader : JSONReader, Value> Reader.readFromMap(crossinline readConte
 }
 
 
-inline fun <Reader : JSONReader> Reader.readFromListByElement(crossinline readElement: Reader.() -> Unit) {
+inline fun <Reader : JsonReader> Reader.readFromListByElement(crossinline readElement: Reader.() -> Unit) {
 //	contract {
 //		callsInPlace(readElement, InvocationKind.UNKNOWN)
 //	}
 
 	readFromList {
-		while (nextToken != JSONToken.listEnd) {
+		while (nextToken != JsonToken.listEnd) {
 			isolateValueRead(readElement)
 		}
 	}
 }
 
 
-inline fun <Reader : JSONReader> Reader.readFromMapByElement(crossinline readElement: Reader.() -> Unit) {
+inline fun <Reader : JsonReader> Reader.readFromMapByElement(crossinline readElement: Reader.() -> Unit) {
 //	contract {
 //		callsInPlace(readElement, InvocationKind.UNKNOWN)
 //	}
 
 	readFromMap {
-		while (nextToken != JSONToken.mapEnd)
+		while (nextToken != JsonToken.mapEnd)
 			readElement()
 	}
 }
 
 
-inline fun <Reader : JSONReader> Reader.readFromMapByElementValue(crossinline readElementValue: Reader.(key: String) -> Unit) {
+inline fun <Reader : JsonReader> Reader.readFromMapByElementValue(crossinline readElementValue: Reader.(key: String) -> Unit) {
 //	contract {
 //		callsInPlace(readElementValue, InvocationKind.UNKNOWN)
 //	}
@@ -222,11 +222,11 @@ inline fun <Reader : JSONReader> Reader.readFromMapByElementValue(crossinline re
 }
 
 
-fun JSONReader.readList() =
+fun JsonReader.readList() =
 	readListByElement { readValueOrNull() }
 
 
-inline fun <Reader : JSONReader, Value> Reader.readListByElement(crossinline readElement: Reader.() -> Value): List<Value> {
+inline fun <Reader : JsonReader, Value> Reader.readListByElement(crossinline readElement: Reader.() -> Value): List<Value> {
 //	contract {
 //		callsInPlace(readElement, InvocationKind.UNKNOWN)
 //	}
@@ -239,11 +239,11 @@ inline fun <Reader : JSONReader, Value> Reader.readListByElement(crossinline rea
 }
 
 
-fun JSONReader.readListOrNull() =
+fun JsonReader.readListOrNull() =
 	readOrNull { readList() }
 
 
-inline fun <Reader : JSONReader, Value> Reader.readListOrNullByElement(crossinline readElement: Reader.() -> Value): List<Value>? {
+inline fun <Reader : JsonReader, Value> Reader.readListOrNullByElement(crossinline readElement: Reader.() -> Value): List<Value>? {
 //	contract {
 //		callsInPlace(readElement, InvocationKind.UNKNOWN)
 //	}
@@ -252,15 +252,15 @@ inline fun <Reader : JSONReader, Value> Reader.readListOrNullByElement(crossinli
 }
 
 
-fun JSONReader.readLongOrNull() =
+fun JsonReader.readLongOrNull() =
 	readOrNull { readLong() }
 
 
-fun JSONReader.readMap() =
+fun JsonReader.readMap() =
 	readMapByElementValue { readValueOrNull() }
 
 
-inline fun <Reader : JSONReader, ElementKey, ElementValue> Reader.readMapByElement(
+inline fun <Reader : JsonReader, ElementKey, ElementValue> Reader.readMapByElement(
 	crossinline readElement: Reader.() -> Pair<ElementKey, ElementValue>
 ): Map<ElementKey, ElementValue> {
 //	contract {
@@ -275,7 +275,7 @@ inline fun <Reader : JSONReader, ElementKey, ElementValue> Reader.readMapByEleme
 }
 
 
-inline fun <Reader : JSONReader, ElementValue> Reader.readMapByElementValue(
+inline fun <Reader : JsonReader, ElementValue> Reader.readMapByElementValue(
 	crossinline readElementValue: Reader.(key: String) -> ElementValue
 ): Map<String, ElementValue> {
 //	contract {
@@ -290,11 +290,11 @@ inline fun <Reader : JSONReader, ElementValue> Reader.readMapByElementValue(
 }
 
 
-fun JSONReader.readMapOrNull() =
+fun JsonReader.readMapOrNull() =
 	readOrNull { readMap() }
 
 
-inline fun <Reader : JSONReader, ElementKey, ElementValue> Reader.readMapOrNullByElement(
+inline fun <Reader : JsonReader, ElementKey, ElementValue> Reader.readMapOrNullByElement(
 	crossinline readElement: Reader.() -> Pair<ElementKey, ElementValue>
 ): Map<ElementKey, ElementValue>? {
 //	contract {
@@ -305,7 +305,7 @@ inline fun <Reader : JSONReader, ElementKey, ElementValue> Reader.readMapOrNullB
 }
 
 
-inline fun <Reader : JSONReader, ElementValue> Reader.readMapOrNullByElementValue(
+inline fun <Reader : JsonReader, ElementValue> Reader.readMapOrNullByElementValue(
 	crossinline readElementValue: Reader.(key: String) -> ElementValue
 ): Map<String, ElementValue>? {
 //	contract {
@@ -316,35 +316,35 @@ inline fun <Reader : JSONReader, ElementValue> Reader.readMapOrNullByElementValu
 }
 
 
-fun JSONReader.readNumberOrNull() =
+fun JsonReader.readNumberOrNull() =
 	readOrNull { readNumber() }
 
 
-inline fun <Reader : JSONReader, Value : Any> Reader.readOrNull(crossinline read: Reader.() -> Value): Value? {
+inline fun <Reader : JsonReader, Value : Any> Reader.readOrNull(crossinline read: Reader.() -> Value): Value? {
 //	contract {
 //		callsInPlace(read, InvocationKind.AT_MOST_ONCE)
 //	}
 
-	return if (nextToken != JSONToken.nullValue)
+	return if (nextToken != JsonToken.nullValue)
 		isolateValueRead(read)
 	else
 		readNull()
 }
 
 
-fun JSONReader.readShortOrNull() =
+fun JsonReader.readShortOrNull() =
 	readOrNull { readShort() }
 
 
-fun JSONReader.readStringOrNull() =
+fun JsonReader.readStringOrNull() =
 	readOrNull { readString() }
 
 
-fun JSONReader.readValueOrNull() =
+fun JsonReader.readValueOrNull() =
 	readOrNull { readValue() }
 
 
-inline fun <Reader : JSONReader?, Result> Reader.use(withTermination: Boolean = true, block: (Reader) -> Result): Result {
+inline fun <Reader : JsonReader?, Result> Reader.use(withTermination: Boolean = true, block: (Reader) -> Result): Result {
 //	contract {
 //		callsInPlace(block, InvocationKind.EXACTLY_ONCE)
 //	}
@@ -382,7 +382,7 @@ inline fun <Reader : JSONReader?, Result> Reader.use(withTermination: Boolean =
 }
 
 
-inline fun <Reader : JSONReader, Result> Reader.withTermination(withTermination: Boolean = true, block: Reader.() -> Result): Result {
+inline fun <Reader : JsonReader, Result> Reader.withTermination(withTermination: Boolean = true, block: Reader.() -> Result): Result {
 //	contract {
 //		callsInPlace(block, InvocationKind.EXACTLY_ONCE)
 //	}
diff --git a/basic/sources/JsonSerializer.kt b/basic/sources/JsonSerializer.kt
new file mode 100644
index 0000000..370ddfd
--- /dev/null
+++ b/basic/sources/JsonSerializer.kt
@@ -0,0 +1,23 @@
+package io.fluidsonic.json
+
+import java.io.*
+
+
+interface JsonSerializer {
+
+	fun serializeValue(value: Any?, destination: JsonWriter, withTermination: Boolean = true)
+
+
+	companion object {
+
+		val default: JsonSerializer get() = StandardSerializer
+	}
+}
+
+
+fun JsonSerializer.serializeValue(value: Any?) =
+	StringWriter().apply { serializeValue(value, destination = this) }.toString()
+
+
+fun JsonSerializer.serializeValue(value: Any?, destination: Writer, withTermination: Boolean = true) =
+	serializeValue(value, destination = JsonWriter.build(destination), withTermination = withTermination)
diff --git a/basic/sources/JSONToken.kt b/basic/sources/JsonToken.kt
similarity index 82%
rename from basic/sources/JSONToken.kt
rename to basic/sources/JsonToken.kt
index 5041a49..a2154df 100644
--- a/basic/sources/JSONToken.kt
+++ b/basic/sources/JsonToken.kt
@@ -1,7 +1,7 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-enum class JSONToken {
+enum class JsonToken {
 
 	booleanValue,
 	listEnd,
@@ -32,5 +32,5 @@ enum class JSONToken {
 }
 
 
-fun JSONToken?.toString() =
+fun JsonToken?.toString() =
 	this?.toString() ?: "end of data"
diff --git a/basic/sources/JSONWriter.kt b/basic/sources/JsonWriter.kt
similarity index 68%
rename from basic/sources/JSONWriter.kt
rename to basic/sources/JsonWriter.kt
index 5fe9d8b..e8c792f 100644
--- a/basic/sources/JSONWriter.kt
+++ b/basic/sources/JsonWriter.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.io.*
 
@@ -7,15 +7,15 @@ import java.io.*
 // - https://youtrack.jetbrains.com/issue/KT-29614
 
 
-interface JSONWriter : Closeable, Flushable {
+interface JsonWriter : Closeable, Flushable {
 
-	val depth: JSONDepth
+	val depth: JsonDepth
 	val isErrored: Boolean
 	val isInValueIsolation: Boolean
-	val path: JSONPath
+	val path: JsonPath
 
-	fun beginValueIsolation(): JSONDepth
-	fun endValueIsolation(depth: JSONDepth)
+	fun beginValueIsolation(): JsonDepth
+	fun endValueIsolation(depth: JsonDepth)
 	fun markAsErrored()
 	fun terminate()
 	fun writeBoolean(value: Boolean)
@@ -87,7 +87,7 @@ interface JSONWriter : Closeable, Flushable {
 			is ShortArray -> writeList(value)
 			is String -> writeString(value)
 			is Number -> writeNumber(value) // after subclasses
-			else -> throw JSONException.Serialization(
+			else -> throw JsonException.Serialization(
 				message = "Cannot write JSON value of ${value::class}: $value",
 				path = path
 			)
@@ -97,13 +97,13 @@ interface JSONWriter : Closeable, Flushable {
 
 	companion object {
 
-		fun build(destination: Writer): JSONWriter =
+		fun build(destination: Writer): JsonWriter =
 			StandardWriter(destination)
 	}
 }
 
 
-inline fun <Writer : JSONWriter> Writer.isolateValueWrite(crossinline write: Writer.() -> Unit) {
+inline fun <Writer : JsonWriter> Writer.isolateValueWrite(crossinline write: Writer.() -> Unit) {
 	val depth = beginValueIsolation()
 	val value = write()
 	endValueIsolation(depth = depth)
@@ -112,7 +112,7 @@ inline fun <Writer : JSONWriter> Writer.isolateValueWrite(crossinline write: Wri
 }
 
 
-inline fun <Writer : JSONWriter?, Result> Writer.use(withTermination: Boolean = true, block: (Writer) -> Result): Result {
+inline fun <Writer : JsonWriter?, Result> Writer.use(withTermination: Boolean = true, block: (Writer) -> Result): Result {
 //	contract {
 //		callsInPlace(block, InvocationKind.EXACTLY_ONCE)
 //	}
@@ -150,7 +150,7 @@ inline fun <Writer : JSONWriter?, Result> Writer.use(withTermination: Boolean =
 }
 
 
-inline fun <Writer : JSONWriter, Result> Writer.withTermination(withTermination: Boolean = true, block: Writer.() -> Result): Result {
+inline fun <Writer : JsonWriter, Result> Writer.withTermination(withTermination: Boolean = true, block: Writer.() -> Result): Result {
 //	contract {
 //		callsInPlace(block, InvocationKind.EXACTLY_ONCE)
 //	}
@@ -162,14 +162,14 @@ inline fun <Writer : JSONWriter, Result> Writer.withTermination(withTermination:
 }
 
 
-inline fun <Writer : JSONWriter, ReturnValue> Writer.withErrorChecking(block: Writer.() -> ReturnValue): ReturnValue {
+inline fun <Writer : JsonWriter, ReturnValue> Writer.withErrorChecking(block: Writer.() -> ReturnValue): ReturnValue {
 //	contract {
 //		callsInPlace(block, InvocationKind.EXACTLY_ONCE)
 //	}
 
 	if (isErrored) {
-		throw JSONException.Serialization(
-			message = "Cannot operate on an errored JSONWriter",
+		throw JsonException.Serialization(
+			message = "Cannot operate on an errored JsonWriter",
 			path = path
 		)
 	}
@@ -184,31 +184,31 @@ inline fun <Writer : JSONWriter, ReturnValue> Writer.withErrorChecking(block: Wr
 }
 
 
-fun JSONWriter.writeBooleanOrNull(value: Boolean?) =
-	writeOrNull(value, JSONWriter::writeBoolean)
+fun JsonWriter.writeBooleanOrNull(value: Boolean?) =
+	writeOrNull(value, JsonWriter::writeBoolean)
 
 
-fun JSONWriter.writeByteOrNull(value: Byte?) =
-	writeOrNull(value, JSONWriter::writeByte)
+fun JsonWriter.writeByteOrNull(value: Byte?) =
+	writeOrNull(value, JsonWriter::writeByte)
 
 
-fun JSONWriter.writeCharOrNull(value: Char?) =
-	writeOrNull(value, JSONWriter::writeChar)
+fun JsonWriter.writeCharOrNull(value: Char?) =
+	writeOrNull(value, JsonWriter::writeChar)
 
 
-fun JSONWriter.writeDoubleOrNull(value: Double?) =
-	writeOrNull(value, JSONWriter::writeDouble)
+fun JsonWriter.writeDoubleOrNull(value: Double?) =
+	writeOrNull(value, JsonWriter::writeDouble)
 
 
-fun JSONWriter.writeFloatOrNull(value: Float?) =
-	writeOrNull(value, JSONWriter::writeFloat)
+fun JsonWriter.writeFloatOrNull(value: Float?) =
+	writeOrNull(value, JsonWriter::writeFloat)
 
 
-fun JSONWriter.writeIntOrNull(value: Int?) =
-	writeOrNull(value, JSONWriter::writeInt)
+fun JsonWriter.writeIntOrNull(value: Int?) =
+	writeOrNull(value, JsonWriter::writeInt)
 
 
-inline fun <Writer : JSONWriter> Writer.writeIntoList(crossinline writeContent: Writer.() -> Unit) {
+inline fun <Writer : JsonWriter> Writer.writeIntoList(crossinline writeContent: Writer.() -> Unit) {
 //	contract {
 //		callsInPlace(writeContent, InvocationKind.EXACTLY_ONCE)
 //	}
@@ -221,7 +221,7 @@ inline fun <Writer : JSONWriter> Writer.writeIntoList(crossinline writeContent:
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeIntoMap(crossinline writeContent: Writer.() -> Unit) {
+inline fun <Writer : JsonWriter> Writer.writeIntoMap(crossinline writeContent: Writer.() -> Unit) {
 //	contract {
 //		callsInPlace(writeContent, InvocationKind.EXACTLY_ONCE)
 //	}
@@ -234,51 +234,51 @@ inline fun <Writer : JSONWriter> Writer.writeIntoMap(crossinline writeContent: W
 }
 
 
-fun JSONWriter.writeList(value: BooleanArray) =
+fun JsonWriter.writeList(value: BooleanArray) =
 	writeListByElement(value) { writeBoolean(it) }
 
 
-fun JSONWriter.writeList(value: ByteArray) =
+fun JsonWriter.writeList(value: ByteArray) =
 	writeListByElement(value) { writeByte(it) }
 
 
-fun JSONWriter.writeList(value: CharArray) =
+fun JsonWriter.writeList(value: CharArray) =
 	writeListByElement(value) { writeChar(it) }
 
 
-fun JSONWriter.writeList(value: DoubleArray) =
+fun JsonWriter.writeList(value: DoubleArray) =
 	writeListByElement(value) { writeDouble(it) }
 
 
-fun JSONWriter.writeList(value: FloatArray) =
+fun JsonWriter.writeList(value: FloatArray) =
 	writeListByElement(value) { writeFloat(it) }
 
 
-fun JSONWriter.writeList(value: IntArray) =
+fun JsonWriter.writeList(value: IntArray) =
 	writeListByElement(value) { writeInt(it) }
 
 
-fun JSONWriter.writeList(value: LongArray) =
+fun JsonWriter.writeList(value: LongArray) =
 	writeListByElement(value) { writeLong(it) }
 
 
-fun JSONWriter.writeList(value: ShortArray) =
+fun JsonWriter.writeList(value: ShortArray) =
 	writeListByElement(value) { writeShort(it) }
 
 
-fun JSONWriter.writeList(value: Array<*>) =
+fun JsonWriter.writeList(value: Array<*>) =
 	writeListByElement(value) { writeValueOrNull(it) }
 
 
-fun JSONWriter.writeList(value: Iterable<*>) =
+fun JsonWriter.writeList(value: Iterable<*>) =
 	writeListByElement(value) { writeValueOrNull(it) }
 
 
-fun JSONWriter.writeList(value: Sequence<*>) =
+fun JsonWriter.writeList(value: Sequence<*>) =
 	writeListByElement(value) { writeValueOrNull(it) }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListByElement(
+inline fun <Writer : JsonWriter> Writer.writeListByElement(
 	value: BooleanArray,
 	crossinline writeElement: Writer.(element: Boolean) -> Unit
 ) {
@@ -296,7 +296,7 @@ inline fun <Writer : JSONWriter> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListByElement(
+inline fun <Writer : JsonWriter> Writer.writeListByElement(
 	value: ByteArray,
 	crossinline writeElement: Writer.(element: Byte) -> Unit
 ) {
@@ -314,7 +314,7 @@ inline fun <Writer : JSONWriter> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListByElement(
+inline fun <Writer : JsonWriter> Writer.writeListByElement(
 	value: CharArray,
 	crossinline writeElement: Writer.(element: Char) -> Unit
 ) {
@@ -332,7 +332,7 @@ inline fun <Writer : JSONWriter> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListByElement(
+inline fun <Writer : JsonWriter> Writer.writeListByElement(
 	value: DoubleArray,
 	crossinline writeElement: Writer.(element: Double) -> Unit
 ) {
@@ -350,7 +350,7 @@ inline fun <Writer : JSONWriter> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListByElement(
+inline fun <Writer : JsonWriter> Writer.writeListByElement(
 	value: FloatArray,
 	crossinline writeElement: Writer.(element: Float) -> Unit
 ) {
@@ -368,7 +368,7 @@ inline fun <Writer : JSONWriter> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListByElement(
+inline fun <Writer : JsonWriter> Writer.writeListByElement(
 	value: IntArray,
 	crossinline writeElement: Writer.(element: Int) -> Unit
 ) {
@@ -386,7 +386,7 @@ inline fun <Writer : JSONWriter> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListByElement(
+inline fun <Writer : JsonWriter> Writer.writeListByElement(
 	value: LongArray,
 	crossinline writeElement: Writer.(element: Long) -> Unit
 ) {
@@ -404,7 +404,7 @@ inline fun <Writer : JSONWriter> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListByElement(
+inline fun <Writer : JsonWriter> Writer.writeListByElement(
 	value: ShortArray,
 	crossinline writeElement: Writer.(element: Short) -> Unit
 ) {
@@ -422,7 +422,7 @@ inline fun <Writer : JSONWriter> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeListByElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeListByElement(
 	value: Array<Element>,
 	crossinline writeElement: Writer.(element: Element) -> Unit
 ) {
@@ -440,7 +440,7 @@ inline fun <Writer : JSONWriter, Element> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeListByElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeListByElement(
 	value: Iterable<Element>,
 	crossinline writeElement: Writer.(element: Element) -> Unit
 ) {
@@ -458,7 +458,7 @@ inline fun <Writer : JSONWriter, Element> Writer.writeListByElement(
 }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeListByElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeListByElement(
 	value: Sequence<Element>,
 	crossinline writeElement: Writer.(element: Element) -> Unit
 ) {
@@ -476,51 +476,51 @@ inline fun <Writer : JSONWriter, Element> Writer.writeListByElement(
 }
 
 
-fun JSONWriter.writeListOrNull(value: BooleanArray?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: BooleanArray?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: ByteArray?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: ByteArray?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: CharArray?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: CharArray?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: DoubleArray?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: DoubleArray?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: FloatArray?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: FloatArray?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: IntArray?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: IntArray?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: LongArray?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: LongArray?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: ShortArray?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: ShortArray?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: Array<*>?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: Array<*>?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: Iterable<*>?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: Iterable<*>?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-fun JSONWriter.writeListOrNull(value: Sequence<*>?) =
-	writeOrNull(value, JSONWriter::writeList)
+fun JsonWriter.writeListOrNull(value: Sequence<*>?) =
+	writeOrNull(value, JsonWriter::writeList)
 
 
-inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter> Writer.writeListOrNullByElement(
 	value: BooleanArray?,
 	crossinline writeElement: Writer.(element: Boolean) -> Unit
 ) {
@@ -532,7 +532,7 @@ inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter> Writer.writeListOrNullByElement(
 	value: ByteArray?,
 	crossinline writeElement: Writer.(element: Byte) -> Unit
 ) {
@@ -544,7 +544,7 @@ inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter> Writer.writeListOrNullByElement(
 	value: CharArray?,
 	crossinline writeElement: Writer.(element: Char) -> Unit
 ) {
@@ -556,7 +556,7 @@ inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter> Writer.writeListOrNullByElement(
 	value: DoubleArray?,
 	crossinline writeElement: Writer.(element: Double) -> Unit
 ) {
@@ -568,7 +568,7 @@ inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter> Writer.writeListOrNullByElement(
 	value: FloatArray?,
 	crossinline writeElement: Writer.(element: Float) -> Unit
 ) {
@@ -580,7 +580,7 @@ inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter> Writer.writeListOrNullByElement(
 	value: IntArray?,
 	crossinline writeElement: Writer.(element: Int) -> Unit
 ) {
@@ -592,7 +592,7 @@ inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter> Writer.writeListOrNullByElement(
 	value: LongArray?,
 	crossinline writeElement: Writer.(element: Long) -> Unit
 ) {
@@ -604,7 +604,7 @@ inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter> Writer.writeListOrNullByElement(
 	value: ShortArray?,
 	crossinline writeElement: Writer.(element: Short) -> Unit
 ) {
@@ -616,7 +616,7 @@ inline fun <Writer : JSONWriter> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeListOrNullByElement(
 	value: Array<Element>?,
 	crossinline writeElement: Writer.(element: Element) -> Unit
 ) {
@@ -628,7 +628,7 @@ inline fun <Writer : JSONWriter, Element> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeListOrNullByElement(
 	value: Iterable<Element>?,
 	crossinline writeElement: Writer.(element: Element) -> Unit
 ) {
@@ -640,7 +640,7 @@ inline fun <Writer : JSONWriter, Element> Writer.writeListOrNullByElement(
 }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeListOrNullByElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeListOrNullByElement(
 	value: Sequence<Element>?,
 	crossinline writeElement: Writer.(element: Element) -> Unit
 ) {
@@ -652,15 +652,15 @@ inline fun <Writer : JSONWriter, Element> Writer.writeListOrNullByElement(
 }
 
 
-fun JSONWriter.writeLongOrNull(value: Long?) =
-	writeOrNull(value, JSONWriter::writeLong)
+fun JsonWriter.writeLongOrNull(value: Long?) =
+	writeOrNull(value, JsonWriter::writeLong)
 
 
-fun JSONWriter.writeMap(value: Map<*, *>) =
+fun JsonWriter.writeMap(value: Map<*, *>) =
 	writeMapByElementValue(value) { writeValueOrNull(it) }
 
 
-inline fun <Writer : JSONWriter, ElementKey, ElementValue> Writer.writeMapByElement(
+inline fun <Writer : JsonWriter, ElementKey, ElementValue> Writer.writeMapByElement(
 	value: Map<ElementKey, ElementValue>,
 	crossinline writeElement: Writer.(key: ElementKey, value: ElementValue) -> Unit
 ) {
@@ -675,7 +675,7 @@ inline fun <Writer : JSONWriter, ElementKey, ElementValue> Writer.writeMapByElem
 }
 
 
-inline fun <Writer : JSONWriter, ElementValue> Writer.writeMapByElementValue(
+inline fun <Writer : JsonWriter, ElementValue> Writer.writeMapByElementValue(
 	value: Map<*, ElementValue>,
 	crossinline writeElementValue: Writer.(value: ElementValue) -> Unit
 ) {
@@ -692,11 +692,11 @@ inline fun <Writer : JSONWriter, ElementValue> Writer.writeMapByElementValue(
 }
 
 
-fun JSONWriter.writeMapOrNull(value: Map<*, *>?) =
-	writeOrNull(value, JSONWriter::writeMap)
+fun JsonWriter.writeMapOrNull(value: Map<*, *>?) =
+	writeOrNull(value, JsonWriter::writeMap)
 
 
-inline fun <Writer : JSONWriter, ElementKey, ElementValue> Writer.writeMapOrNullByElement(
+inline fun <Writer : JsonWriter, ElementKey, ElementValue> Writer.writeMapOrNullByElement(
 	value: Map<ElementKey, ElementValue>?,
 	crossinline writeElement: Writer.(key: ElementKey, value: ElementValue) -> Unit
 ) {
@@ -708,7 +708,7 @@ inline fun <Writer : JSONWriter, ElementKey, ElementValue> Writer.writeMapOrNull
 }
 
 
-inline fun <Writer : JSONWriter, ElementValue> Writer.writeMapOrNullByElementValue(
+inline fun <Writer : JsonWriter, ElementValue> Writer.writeMapOrNullByElementValue(
 	value: Map<*, ElementValue>?,
 	crossinline writeElementValue: Writer.(value: ElementValue) -> Unit
 ) {
@@ -720,13 +720,13 @@ inline fun <Writer : JSONWriter, ElementValue> Writer.writeMapOrNullByElementVal
 }
 
 
-fun JSONWriter.writeMapElement(key: String, boolean: Boolean) {
+fun JsonWriter.writeMapElement(key: String, boolean: Boolean) {
 	writeMapKey(key)
 	writeBoolean(boolean)
 }
 
 
-fun JSONWriter.writeMapElement(key: String, boolean: Boolean?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, boolean: Boolean?, skipIfNull: Boolean = false) =
 	if (boolean != null)
 		writeMapElement(key, boolean)
 	else if (!skipIfNull)
@@ -735,13 +735,13 @@ fun JSONWriter.writeMapElement(key: String, boolean: Boolean?, skipIfNull: Boole
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, byte: Byte) {
+fun JsonWriter.writeMapElement(key: String, byte: Byte) {
 	writeMapKey(key)
 	writeByte(byte)
 }
 
 
-fun JSONWriter.writeMapElement(key: String, byte: Byte?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, byte: Byte?, skipIfNull: Boolean = false) =
 	if (byte != null)
 		writeMapElement(key, byte)
 	else if (!skipIfNull)
@@ -750,13 +750,13 @@ fun JSONWriter.writeMapElement(key: String, byte: Byte?, skipIfNull: Boolean = f
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, char: Char) {
+fun JsonWriter.writeMapElement(key: String, char: Char) {
 	writeMapKey(key)
 	writeChar(char)
 }
 
 
-fun JSONWriter.writeMapElement(key: String, char: Char?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, char: Char?, skipIfNull: Boolean = false) =
 	if (char != null)
 		writeMapElement(key, char)
 	else if (!skipIfNull)
@@ -765,13 +765,13 @@ fun JSONWriter.writeMapElement(key: String, char: Char?, skipIfNull: Boolean = f
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, double: Double) {
+fun JsonWriter.writeMapElement(key: String, double: Double) {
 	writeMapKey(key)
 	writeDouble(double)
 }
 
 
-fun JSONWriter.writeMapElement(key: String, double: Double?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, double: Double?, skipIfNull: Boolean = false) =
 	if (double != null)
 		writeMapElement(key, double)
 	else if (!skipIfNull)
@@ -780,13 +780,13 @@ fun JSONWriter.writeMapElement(key: String, double: Double?, skipIfNull: Boolean
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, float: Float) {
+fun JsonWriter.writeMapElement(key: String, float: Float) {
 	writeMapKey(key)
 	writeFloat(float)
 }
 
 
-fun JSONWriter.writeMapElement(key: String, float: Float?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, float: Float?, skipIfNull: Boolean = false) =
 	if (float != null)
 		writeMapElement(key, float)
 	else if (!skipIfNull)
@@ -795,13 +795,13 @@ fun JSONWriter.writeMapElement(key: String, float: Float?, skipIfNull: Boolean =
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, int: Int) {
+fun JsonWriter.writeMapElement(key: String, int: Int) {
 	writeMapKey(key)
 	writeInt(int)
 }
 
 
-fun JSONWriter.writeMapElement(key: String, int: Int?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, int: Int?, skipIfNull: Boolean = false) =
 	if (int != null)
 		writeMapElement(key, int)
 	else if (!skipIfNull)
@@ -810,11 +810,11 @@ fun JSONWriter.writeMapElement(key: String, int: Int?, skipIfNull: Boolean = fal
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, list: Array<*>?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: Array<*>?, skipIfNull: Boolean = false) =
 	writeMapElement(key, list = list, skipIfNull = skipIfNull) { writeValueOrNull(it) }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeMapElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeMapElement(
 	key: String,
 	list: Array<Element>?,
 	skipIfNull: Boolean = false,
@@ -833,7 +833,7 @@ inline fun <Writer : JSONWriter, Element> Writer.writeMapElement(
 }
 
 
-fun JSONWriter.writeMapElement(key: String, list: BooleanArray?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: BooleanArray?, skipIfNull: Boolean = false) =
 	if (list != null) {
 		writeMapKey(key)
 		writeList(list)
@@ -844,7 +844,7 @@ fun JSONWriter.writeMapElement(key: String, list: BooleanArray?, skipIfNull: Boo
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, list: ByteArray?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: ByteArray?, skipIfNull: Boolean = false) =
 	if (list != null) {
 		writeMapKey(key)
 		writeList(list)
@@ -855,7 +855,7 @@ fun JSONWriter.writeMapElement(key: String, list: ByteArray?, skipIfNull: Boolea
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, list: CharArray?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: CharArray?, skipIfNull: Boolean = false) =
 	if (list != null) {
 		writeMapKey(key)
 		writeList(list)
@@ -866,7 +866,7 @@ fun JSONWriter.writeMapElement(key: String, list: CharArray?, skipIfNull: Boolea
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, list: DoubleArray?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: DoubleArray?, skipIfNull: Boolean = false) =
 	if (list != null) {
 		writeMapKey(key)
 		writeList(list)
@@ -877,7 +877,7 @@ fun JSONWriter.writeMapElement(key: String, list: DoubleArray?, skipIfNull: Bool
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, list: FloatArray?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: FloatArray?, skipIfNull: Boolean = false) =
 	if (list != null) {
 		writeMapKey(key)
 		writeList(list)
@@ -888,7 +888,7 @@ fun JSONWriter.writeMapElement(key: String, list: FloatArray?, skipIfNull: Boole
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, list: IntArray?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: IntArray?, skipIfNull: Boolean = false) =
 	if (list != null) {
 		writeMapKey(key)
 		writeList(list)
@@ -899,11 +899,11 @@ fun JSONWriter.writeMapElement(key: String, list: IntArray?, skipIfNull: Boolean
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, list: Iterable<*>?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: Iterable<*>?, skipIfNull: Boolean = false) =
 	writeMapElement(key, list = list, skipIfNull = skipIfNull) { writeValueOrNull(it) }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeMapElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeMapElement(
 	key: String,
 	list: Iterable<Element>?,
 	skipIfNull: Boolean = false,
@@ -922,7 +922,7 @@ inline fun <Writer : JSONWriter, Element> Writer.writeMapElement(
 }
 
 
-fun JSONWriter.writeMapElement(key: String, list: LongArray?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: LongArray?, skipIfNull: Boolean = false) =
 	if (list != null) {
 		writeMapKey(key)
 		writeList(list)
@@ -933,11 +933,11 @@ fun JSONWriter.writeMapElement(key: String, list: LongArray?, skipIfNull: Boolea
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, list: Sequence<*>?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: Sequence<*>?, skipIfNull: Boolean = false) =
 	writeMapElement(key, list = list, skipIfNull = skipIfNull) { writeValueOrNull(it) }
 
 
-inline fun <Writer : JSONWriter, Element> Writer.writeMapElement(
+inline fun <Writer : JsonWriter, Element> Writer.writeMapElement(
 	key: String,
 	list: Sequence<Element>?,
 	skipIfNull: Boolean = false,
@@ -956,7 +956,7 @@ inline fun <Writer : JSONWriter, Element> Writer.writeMapElement(
 }
 
 
-fun JSONWriter.writeMapElement(key: String, list: ShortArray?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, list: ShortArray?, skipIfNull: Boolean = false) =
 	if (list != null) {
 		writeMapKey(key)
 		writeList(list)
@@ -967,13 +967,13 @@ fun JSONWriter.writeMapElement(key: String, list: ShortArray?, skipIfNull: Boole
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, long: Long) {
+fun JsonWriter.writeMapElement(key: String, long: Long) {
 	writeMapKey(key)
 	writeLong(long)
 }
 
 
-fun JSONWriter.writeMapElement(key: String, long: Long?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, long: Long?, skipIfNull: Boolean = false) =
 	if (long != null)
 		writeMapElement(key, long)
 	else if (!skipIfNull)
@@ -982,11 +982,11 @@ fun JSONWriter.writeMapElement(key: String, long: Long?, skipIfNull: Boolean = f
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, map: Map<*, *>?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, map: Map<*, *>?, skipIfNull: Boolean = false) =
 	writeMapElement(key, map = map, skipIfNull = skipIfNull) { writeValueOrNull(it) }
 
 
-inline fun <Writer : JSONWriter, Child> Writer.writeMapElement(
+inline fun <Writer : JsonWriter, Child> Writer.writeMapElement(
 	key: String,
 	map: Map<*, Child>?,
 	skipIfNull: Boolean = false,
@@ -1002,7 +1002,7 @@ inline fun <Writer : JSONWriter, Child> Writer.writeMapElement(
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, number: Number?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, number: Number?, skipIfNull: Boolean = false) =
 	if (number != null) {
 		writeMapKey(key)
 		writeNumber(number)
@@ -1013,13 +1013,13 @@ fun JSONWriter.writeMapElement(key: String, number: Number?, skipIfNull: Boolean
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, short: Short) {
+fun JsonWriter.writeMapElement(key: String, short: Short) {
 	writeMapKey(key)
 	writeShort(short)
 }
 
 
-fun JSONWriter.writeMapElement(key: String, short: Short?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, short: Short?, skipIfNull: Boolean = false) =
 	if (short != null)
 		writeMapElement(key, short)
 	else if (!skipIfNull)
@@ -1028,7 +1028,7 @@ fun JSONWriter.writeMapElement(key: String, short: Short?, skipIfNull: Boolean =
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, string: String?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, string: String?, skipIfNull: Boolean = false) =
 	if (string != null) {
 		writeMapKey(key)
 		writeString(string)
@@ -1039,11 +1039,11 @@ fun JSONWriter.writeMapElement(key: String, string: String?, skipIfNull: Boolean
 		Unit
 
 
-fun JSONWriter.writeMapElement(key: String, value: Any?, skipIfNull: Boolean = false) =
+fun JsonWriter.writeMapElement(key: String, value: Any?, skipIfNull: Boolean = false) =
 	writeMapElement(key, value, skipIfNull) { writeValue(it) }
 
 
-inline fun <Writer : JSONWriter, Value : Any> Writer.writeMapElement(
+inline fun <Writer : JsonWriter, Value : Any> Writer.writeMapElement(
 	key: String,
 	value: Value?,
 	skipIfNull: Boolean = false,
@@ -1064,7 +1064,7 @@ inline fun <Writer : JSONWriter, Value : Any> Writer.writeMapElement(
 }
 
 
-inline fun <Writer : JSONWriter> Writer.writeMapElement(
+inline fun <Writer : JsonWriter> Writer.writeMapElement(
 	key: String,
 	crossinline writeValue: Writer.() -> Unit
 ) {
@@ -1079,17 +1079,17 @@ inline fun <Writer : JSONWriter> Writer.writeMapElement(
 }
 
 
-fun JSONWriter.writeMapNullElement(key: String) {
+fun JsonWriter.writeMapNullElement(key: String) {
 	writeMapKey(key)
 	writeNull()
 }
 
 
-fun JSONWriter.writeNumberOrNull(value: Number?) =
-	writeOrNull(value, JSONWriter::writeNumber)
+fun JsonWriter.writeNumberOrNull(value: Number?) =
+	writeOrNull(value, JsonWriter::writeNumber)
 
 
-inline fun <Writer : JSONWriter, Value : Any> Writer.writeOrNull(value: Value?, crossinline write: Writer.(value: Value) -> Unit) {
+inline fun <Writer : JsonWriter, Value : Any> Writer.writeOrNull(value: Value?, crossinline write: Writer.(value: Value) -> Unit) {
 //	contract {
 //		callsInPlace(write, InvocationKind.AT_MOST_ONCE)
 //	}
@@ -1101,13 +1101,13 @@ inline fun <Writer : JSONWriter, Value : Any> Writer.writeOrNull(value: Value?,
 }
 
 
-fun JSONWriter.writeShortOrNull(value: Short?) =
-	writeOrNull(value, JSONWriter::writeShort)
+fun JsonWriter.writeShortOrNull(value: Short?) =
+	writeOrNull(value, JsonWriter::writeShort)
 
 
-fun JSONWriter.writeStringOrNull(value: String?) =
-	writeOrNull(value, JSONWriter::writeString)
+fun JsonWriter.writeStringOrNull(value: String?) =
+	writeOrNull(value, JsonWriter::writeString)
 
 
-fun JSONWriter.writeValueOrNull(value: Any?) =
-	writeOrNull(value, JSONWriter::writeValue)
+fun JsonWriter.writeValueOrNull(value: Any?) =
+	writeOrNull(value, JsonWriter::writeValue)
diff --git a/basic/sources/implementations/StandardParser.kt b/basic/sources/implementations/StandardParser.kt
index 5b75fb0..3966014 100644
--- a/basic/sources/implementations/StandardParser.kt
+++ b/basic/sources/implementations/StandardParser.kt
@@ -1,27 +1,27 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal object StandardParser : JSONParser {
+internal object StandardParser : JsonParser {
 
-	private fun parse(source: JSONReader, expectedType: ExpectedType, withTermination: Boolean) =
+	private fun parse(source: JsonReader, expectedType: ExpectedType, withTermination: Boolean) =
 		source.withTermination(withTermination) { parseUnterminated(source, expectedType) }
 
 
-	override fun parseValueOrNull(source: JSONReader, withTermination: Boolean) =
+	override fun parseValueOrNull(source: JsonReader, withTermination: Boolean) =
 		parse(source, ExpectedType.any, withTermination = withTermination)
 
 
-	override fun parseList(source: JSONReader, withTermination: Boolean) =
+	override fun parseList(source: JsonReader, withTermination: Boolean) =
 		parse(source, ExpectedType.list, withTermination = withTermination) as List<*>
 
 
 	@Suppress("UNCHECKED_CAST")
-	override fun parseMap(source: JSONReader, withTermination: Boolean) =
+	override fun parseMap(source: JsonReader, withTermination: Boolean) =
 		parse(source, ExpectedType.map, withTermination = withTermination) as Map<String, *>
 
 
 	@Suppress("UNCHECKED_CAST")
-	private fun parseUnterminated(source: JSONReader, expectedType: ExpectedType): Any? {
+	private fun parseUnterminated(source: JsonReader, expectedType: ExpectedType): Any? {
 		var currentList: MutableList<Any?>? = null
 		var currentKey: String? = null
 		var currentMap: MutableMap<Any?, Any?>? = null
@@ -31,15 +31,15 @@ internal object StandardParser : JSONParser {
 		when (expectedType) {
 			ExpectedType.any -> Unit
 
-			ExpectedType.list -> source.nextToken == JSONToken.listStart ||
-				throw JSONException.Schema(
+			ExpectedType.list -> source.nextToken == JsonToken.listStart ||
+				throw JsonException.Schema(
 					message = "Expected a list, got ${source.nextToken}",
 					offset = source.offset,
 					path = source.path
 				)
 
-			ExpectedType.map -> source.nextToken == JSONToken.mapStart ||
-				throw JSONException.Schema(
+			ExpectedType.map -> source.nextToken == JsonToken.mapStart ||
+				throw JsonException.Schema(
 					message = "Expected a map, got ${source.nextToken}",
 					offset = source.offset,
 					path = source.path
@@ -48,10 +48,10 @@ internal object StandardParser : JSONParser {
 
 		loop@ while (true) {
 			val value: Any? = when (source.nextToken) {
-				JSONToken.booleanValue ->
+				JsonToken.booleanValue ->
 					source.readBoolean()
 
-				JSONToken.listEnd -> {
+				JsonToken.listEnd -> {
 					source.readListEnd()
 
 					val list = currentList
@@ -75,7 +75,7 @@ internal object StandardParser : JSONParser {
 					list
 				}
 
-				JSONToken.listStart -> {
+				JsonToken.listStart -> {
 					source.readListStart()
 
 					val list = mutableListOf<Any?>()
@@ -91,10 +91,10 @@ internal object StandardParser : JSONParser {
 					continue@loop
 				}
 
-				JSONToken.nullValue
+				JsonToken.nullValue
 				-> source.readNull()
 
-				JSONToken.mapEnd -> {
+				JsonToken.mapEnd -> {
 					source.readMapEnd()
 
 					val map = currentMap
@@ -123,12 +123,12 @@ internal object StandardParser : JSONParser {
 					map
 				}
 
-				JSONToken.mapKey -> {
+				JsonToken.mapKey -> {
 					currentKey = source.readMapKey()
 					continue@loop
 				}
 
-				JSONToken.mapStart -> {
+				JsonToken.mapStart -> {
 					source.readMapStart()
 
 					val map = mutableMapOf<Any?, Any?>()
@@ -149,10 +149,10 @@ internal object StandardParser : JSONParser {
 					continue@loop
 				}
 
-				JSONToken.numberValue ->
+				JsonToken.numberValue ->
 					source.readNumber()
 
-				JSONToken.stringValue ->
+				JsonToken.stringValue ->
 					source.readString()
 
 				else ->
diff --git a/basic/sources/implementations/StandardReader.kt b/basic/sources/implementations/StandardReader.kt
index 3fad115..06c5187 100644
--- a/basic/sources/implementations/StandardReader.kt
+++ b/basic/sources/implementations/StandardReader.kt
@@ -1,18 +1,18 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal class StandardReader(private val source: TextInput) : JSONReader {
+internal class StandardReader(private val source: TextInput) : JsonReader {
 
 	private val buffer = StringBuilder()
 	private var isClosed = false
-	private var peekedToken: JSONToken? = null
+	private var peekedToken: JsonToken? = null
 	private var peekedTokenIndex = -1
 	private var state = State()
 	private val stateCache: MutableList<State> = mutableListOf()
 	private val stateStack: MutableList<State> = mutableListOf(state)
 
 
-	override fun beginValueIsolation(): JSONDepth {
+	override fun beginValueIsolation(): JsonDepth {
 		ensureNotClosed()
 
 		valueIsolationCheck(peekTokenIfNeeded() != null) { "the root value has already been read" }
@@ -34,7 +34,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override val depth
-		get() = JSONDepth(stateStack.size - 1)
+		get() = JsonDepth(stateStack.size - 1)
 
 
 	private fun didReadValue() {
@@ -47,7 +47,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 	}
 
 
-	override fun endValueIsolation(depth: JSONDepth) {
+	override fun endValueIsolation(depth: JsonDepth) {
 		ensureNotClosed()
 
 		valueIsolationCheck(depth <= this.depth) { "lists or maps have been ended prematurely" }
@@ -65,7 +65,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	private fun ensureNotClosed() {
-		parsingCheck(!isClosed) { "Cannot operate on a closed JSONReader" }
+		parsingCheck(!isClosed) { "Cannot operate on a closed JsonReader" }
 	}
 
 
@@ -73,7 +73,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 		get() = state.isInValueIsolation
 
 
-	override val nextToken: JSONToken?
+	override val nextToken: JsonToken?
 		get() {
 			ensureNotClosed()
 
@@ -93,9 +93,9 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 		val source = source
 		var character = source.readCharacter()
-		if (character == JSONCharacter.Symbol.hyphenMinus) {
+		if (character == JsonCharacter.Symbol.hyphenMinus) {
 			isNegative = true
-			character = source.readCharacter(required = JSONCharacter::isDigit) { "a digit" }
+			character = source.readCharacter(required = JsonCharacter::isDigit) { "a digit" }
 			negativeLimit = Long.MIN_VALUE
 		}
 		else {
@@ -106,23 +106,23 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 		val minimumBeforeMultiplication = negativeLimit / 10
 		var value = 0L
 
-		if (character == JSONCharacter.Digit.zero) {
-			character = source.readCharacter(required = { !JSONCharacter.isDigit(it) }) {
-				JSONCharacter.toString(
-					JSONCharacter.Symbol.fullStop,
-					JSONCharacter.Letter.e,
-					JSONCharacter.Letter.E
+		if (character == JsonCharacter.Digit.zero) {
+			character = source.readCharacter(required = { !JsonCharacter.isDigit(it) }) {
+				JsonCharacter.toString(
+					JsonCharacter.Symbol.fullStop,
+					JsonCharacter.Letter.e,
+					JsonCharacter.Letter.E
 				) + " or end of number after a leading '0'"
 			}
 		}
 		else {
 			do {
-				val digit = character - JSONCharacter.Digit.zero
+				val digit = character - JsonCharacter.Digit.zero
 				if (value < minimumBeforeMultiplication) {
 					value = negativeLimit
 
 					do character = source.readCharacter()
-					while (JSONCharacter.isDigit(character))
+					while (JsonCharacter.isDigit(character))
 					break
 				}
 
@@ -132,28 +132,28 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 					value = negativeLimit
 
 					do character = source.readCharacter()
-					while (JSONCharacter.isDigit(character))
+					while (JsonCharacter.isDigit(character))
 					break
 				}
 
 				value -= digit
 				character = source.readCharacter()
 			}
-			while (JSONCharacter.isDigit(character))
+			while (JsonCharacter.isDigit(character))
 
 			if (!isNegative) {
 				value *= -1
 			}
 		}
 
-		if (character == JSONCharacter.Symbol.fullStop) { // truncate decimal value
-			source.readCharacter(required = JSONCharacter::isDigit) { "a digit in decimal value of number" }
+		if (character == JsonCharacter.Symbol.fullStop) { // truncate decimal value
+			source.readCharacter(required = JsonCharacter::isDigit) { "a digit in decimal value of number" }
 
 			do character = source.readCharacter()
-			while (JSONCharacter.isDigit(character))
+			while (JsonCharacter.isDigit(character))
 		}
 
-		if (character == JSONCharacter.Letter.e || character == JSONCharacter.Letter.E) { // oh no, an exponent!
+		if (character == JsonCharacter.Letter.e || character == JsonCharacter.Letter.E) { // oh no, an exponent!
 			source.seekTo(startIndex)
 			parseNumberIntoBuffer()
 
@@ -175,38 +175,38 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 		var character = source.readCharacter()
 
 		// consume optional minus sign
-		if (character == JSONCharacter.Symbol.hyphenMinus) {
+		if (character == JsonCharacter.Symbol.hyphenMinus) {
 			buffer.append('-')
 			character = source.readCharacter()
 		}
 
 		// consume integer value
 		when (character) {
-			JSONCharacter.Digit.zero -> {
+			JsonCharacter.Digit.zero -> {
 				buffer.append('0')
-				character = source.readCharacter(required = { !JSONCharacter.isDigit(it) }) {
-					JSONCharacter.toString(
-						JSONCharacter.Symbol.fullStop,
-						JSONCharacter.Letter.e,
-						JSONCharacter.Letter.E
+				character = source.readCharacter(required = { !JsonCharacter.isDigit(it) }) {
+					JsonCharacter.toString(
+						JsonCharacter.Symbol.fullStop,
+						JsonCharacter.Letter.e,
+						JsonCharacter.Letter.E
 					) + " or end of number after a leading '0'"
 				}
 			}
 
-			JSONCharacter.Digit.one,
-			JSONCharacter.Digit.two,
-			JSONCharacter.Digit.three,
-			JSONCharacter.Digit.four,
-			JSONCharacter.Digit.five,
-			JSONCharacter.Digit.six,
-			JSONCharacter.Digit.seven,
-			JSONCharacter.Digit.eight,
-			JSONCharacter.Digit.nine ->
+			JsonCharacter.Digit.one,
+			JsonCharacter.Digit.two,
+			JsonCharacter.Digit.three,
+			JsonCharacter.Digit.four,
+			JsonCharacter.Digit.five,
+			JsonCharacter.Digit.six,
+			JsonCharacter.Digit.seven,
+			JsonCharacter.Digit.eight,
+			JsonCharacter.Digit.nine ->
 				do {
 					buffer.append(character.toChar())
 					character = source.readCharacter()
 				}
-				while (JSONCharacter.isDigit(character))
+				while (JsonCharacter.isDigit(character))
 
 			else ->
 				unexpectedCharacterError(
@@ -217,38 +217,38 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 		}
 
 		// consume optional decimal separator and value
-		if (character == JSONCharacter.Symbol.fullStop) {
+		if (character == JsonCharacter.Symbol.fullStop) {
 			shouldParseAsFloatingPoint = true
 
 			buffer.append('.')
-			character = source.readCharacter(required = JSONCharacter::isDigit) { "a digit in decimal value of number" }
+			character = source.readCharacter(required = JsonCharacter::isDigit) { "a digit in decimal value of number" }
 
 			do {
 				buffer.append(character.toChar())
 				character = source.readCharacter()
 			}
-			while (JSONCharacter.isDigit(character))
+			while (JsonCharacter.isDigit(character))
 		}
 
 		// consume optional exponent separator and value
-		if (character == JSONCharacter.Letter.e || character == JSONCharacter.Letter.E) {
+		if (character == JsonCharacter.Letter.e || character == JsonCharacter.Letter.E) {
 			shouldParseAsFloatingPoint = true
 
 			buffer.append(character.toChar())
 
 			character = source.peekCharacter()
-			if (character == JSONCharacter.Symbol.plusSign || character == JSONCharacter.Symbol.hyphenMinus) {
+			if (character == JsonCharacter.Symbol.plusSign || character == JsonCharacter.Symbol.hyphenMinus) {
 				buffer.append(character.toChar())
 				source.readCharacter()
 			}
 
-			character = source.readCharacter(required = JSONCharacter::isDigit) { "a digit in exponent value of number" }
+			character = source.readCharacter(required = JsonCharacter::isDigit) { "a digit in exponent value of number" }
 
 			do {
 				buffer.append(character.toChar())
 				character = source.readCharacter()
 			}
-			while (JSONCharacter.isDigit(character))
+			while (JsonCharacter.isDigit(character))
 		}
 
 		source.seekBackOneCharacter()
@@ -267,7 +267,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	private fun parsingError(message: String): Nothing {
-		throw JSONException.Parsing(
+		throw JsonException.Parsing(
 			message = message,
 			offset = offset,
 			path = path
@@ -275,22 +275,22 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 	}
 
 
-	override val path: JSONPath
+	override val path: JsonPath
 		get() {
-			if (isClosed) return JSONPath.root
+			if (isClosed) return JsonPath.root
 
 			return when (state.tokenLocation) {
 				TokenLocation.afterRootValue,
 				TokenLocation.beforeRootValue ->
-					JSONPath.root
+					JsonPath.root
 
 				else ->
-					JSONPath(elements = stateStack.mapNotNull { it.toPathElement() })
+					JsonPath(elements = stateStack.mapNotNull { it.toPathElement() })
 			}
 		}
 
 
-	private fun peekToken(): JSONToken? {
+	private fun peekToken(): JsonToken? {
 		val source = source
 
 		while (true) {
@@ -301,15 +301,15 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 			when (state.tokenLocation) {
 				TokenLocation.afterListElement ->
 					when (character) {
-						JSONCharacter.Symbol.comma -> {
+						JsonCharacter.Symbol.comma -> {
 							source.readCharacter()
 
 							state.currentValueListIndex += 1
 							state.tokenLocation = TokenLocation.afterListElementSeparator
 						}
 
-						JSONCharacter.Symbol.rightSquareBracket ->
-							return JSONToken.listEnd
+						JsonCharacter.Symbol.rightSquareBracket ->
+							return JsonToken.listEnd
 
 						else ->
 							unexpectedCharacterError(actual = character, expected = "',' or ']'")
@@ -320,8 +320,8 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 				TokenLocation.afterListStart ->
 					return when (character) {
-						JSONCharacter.Symbol.rightSquareBracket ->
-							JSONToken.listEnd
+						JsonCharacter.Symbol.rightSquareBracket ->
+							JsonToken.listEnd
 
 						else ->
 							peekValueToken(expected = "a value or ']'")
@@ -329,15 +329,15 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 				TokenLocation.afterMapElement ->
 					when (character) {
-						JSONCharacter.Symbol.comma -> {
+						JsonCharacter.Symbol.comma -> {
 							source.readCharacter()
 
 							state.currentValueMapKey = null
 							state.tokenLocation = TokenLocation.afterMapElementSeparator
 						}
 
-						JSONCharacter.Symbol.rightCurlyBracket ->
-							return JSONToken.mapEnd
+						JsonCharacter.Symbol.rightCurlyBracket ->
+							return JsonToken.mapEnd
 
 						else ->
 							unexpectedCharacterError(actual = character, expected = "',' or '}'")
@@ -345,8 +345,8 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 				TokenLocation.afterMapElementSeparator ->
 					when (character) {
-						JSONCharacter.Symbol.quotationMark ->
-							return JSONToken.mapKey
+						JsonCharacter.Symbol.quotationMark ->
+							return JsonToken.mapKey
 
 						else ->
 							unexpectedCharacterError(actual = character, expected = "'\"'")
@@ -354,7 +354,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 				TokenLocation.afterMapKey ->
 					when (character) {
-						JSONCharacter.Symbol.colon -> {
+						JsonCharacter.Symbol.colon -> {
 							source.readCharacter()
 
 							state.tokenLocation = TokenLocation.afterMapKeySeparator
@@ -369,11 +369,11 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 				TokenLocation.afterMapStart ->
 					return when (character) {
-						JSONCharacter.Symbol.quotationMark ->
-							JSONToken.mapKey
+						JsonCharacter.Symbol.quotationMark ->
+							JsonToken.mapKey
 
-						JSONCharacter.Symbol.rightCurlyBracket ->
-							JSONToken.mapEnd
+						JsonCharacter.Symbol.rightCurlyBracket ->
+							JsonToken.mapEnd
 
 						else ->
 							unexpectedCharacterError(actual = character, expected = "'\"' or '}'")
@@ -381,7 +381,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 				TokenLocation.afterRootValue ->
 					when (character) {
-						JSONCharacter.end ->
+						JsonCharacter.end ->
 							return null
 
 						else ->
@@ -395,7 +395,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 	}
 
 
-	private fun peekTokenIfNeeded(): JSONToken? {
+	private fun peekTokenIfNeeded(): JsonToken? {
 		if (peekedTokenIndex >= 0) {
 			return peekedToken
 		}
@@ -408,37 +408,37 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 	}
 
 
-	private fun peekValueToken(expected: String): JSONToken? {
+	private fun peekValueToken(expected: String): JsonToken? {
 		val character = source.peekCharacter()
 		return when (character) {
-			JSONCharacter.Symbol.quotationMark ->
-				JSONToken.stringValue
-
-			JSONCharacter.Symbol.hyphenMinus,
-			JSONCharacter.Digit.zero,
-			JSONCharacter.Digit.one,
-			JSONCharacter.Digit.two,
-			JSONCharacter.Digit.three,
-			JSONCharacter.Digit.four,
-			JSONCharacter.Digit.five,
-			JSONCharacter.Digit.six,
-			JSONCharacter.Digit.seven,
-			JSONCharacter.Digit.eight,
-			JSONCharacter.Digit.nine ->
-				JSONToken.numberValue
-
-			JSONCharacter.Letter.f,
-			JSONCharacter.Letter.t ->
-				JSONToken.booleanValue
-
-			JSONCharacter.Letter.n ->
-				JSONToken.nullValue
-
-			JSONCharacter.Symbol.leftCurlyBracket ->
-				JSONToken.mapStart
-
-			JSONCharacter.Symbol.leftSquareBracket ->
-				JSONToken.listStart
+			JsonCharacter.Symbol.quotationMark ->
+				JsonToken.stringValue
+
+			JsonCharacter.Symbol.hyphenMinus,
+			JsonCharacter.Digit.zero,
+			JsonCharacter.Digit.one,
+			JsonCharacter.Digit.two,
+			JsonCharacter.Digit.three,
+			JsonCharacter.Digit.four,
+			JsonCharacter.Digit.five,
+			JsonCharacter.Digit.six,
+			JsonCharacter.Digit.seven,
+			JsonCharacter.Digit.eight,
+			JsonCharacter.Digit.nine ->
+				JsonToken.numberValue
+
+			JsonCharacter.Letter.f,
+			JsonCharacter.Letter.t ->
+				JsonToken.booleanValue
+
+			JsonCharacter.Letter.n ->
+				JsonToken.nullValue
+
+			JsonCharacter.Symbol.leftCurlyBracket ->
+				JsonToken.mapStart
+
+			JsonCharacter.Symbol.leftSquareBracket ->
+				JsonToken.listStart
 
 			else ->
 				unexpectedCharacterError(actual = character, expected = expected)
@@ -467,24 +467,24 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readBoolean(): Boolean {
-		readToken(JSONToken.booleanValue)
+		readToken(JsonToken.booleanValue)
 
 		return readValue(checkBoundary = true) {
 			source.run {
-				if (peekCharacter() == JSONCharacter.Letter.t) {
-					readCharacter(JSONCharacter.Letter.t)
-					readCharacter(JSONCharacter.Letter.r)
-					readCharacter(JSONCharacter.Letter.u)
-					readCharacter(JSONCharacter.Letter.e)
+				if (peekCharacter() == JsonCharacter.Letter.t) {
+					readCharacter(JsonCharacter.Letter.t)
+					readCharacter(JsonCharacter.Letter.r)
+					readCharacter(JsonCharacter.Letter.u)
+					readCharacter(JsonCharacter.Letter.e)
 
 					true
 				}
 				else {
-					readCharacter(JSONCharacter.Letter.f)
-					readCharacter(JSONCharacter.Letter.a)
-					readCharacter(JSONCharacter.Letter.l)
-					readCharacter(JSONCharacter.Letter.s)
-					readCharacter(JSONCharacter.Letter.e)
+					readCharacter(JsonCharacter.Letter.f)
+					readCharacter(JsonCharacter.Letter.a)
+					readCharacter(JsonCharacter.Letter.l)
+					readCharacter(JsonCharacter.Letter.s)
+					readCharacter(JsonCharacter.Letter.e)
 
 					false
 				}
@@ -494,7 +494,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readDouble(): Double {
-		readToken(JSONToken.numberValue)
+		readToken(JsonToken.numberValue)
 
 		return readValue(checkBoundary = true) {
 			parseNumberIntoBuffer()
@@ -505,7 +505,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readFloat(): Float {
-		readToken(JSONToken.numberValue)
+		readToken(JsonToken.numberValue)
 
 		return readValue(checkBoundary = true) {
 			parseNumberIntoBuffer()
@@ -516,9 +516,9 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readListEnd() {
-		readToken(JSONToken.listEnd)
+		readToken(JsonToken.listEnd)
 
-		source.readCharacter(JSONCharacter.Symbol.rightSquareBracket)
+		source.readCharacter(JsonCharacter.Symbol.rightSquareBracket)
 
 		popState()
 		didReadValue()
@@ -526,19 +526,19 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readListStart() {
-		readToken(JSONToken.listStart)
+		readToken(JsonToken.listStart)
 
 		willReadValue()
 		pushState(tokenLocation = TokenLocation.afterListStart)
 
-		source.readCharacter(JSONCharacter.Symbol.leftSquareBracket)
+		source.readCharacter(JsonCharacter.Symbol.leftSquareBracket)
 
 		state.currentValueListIndex = 0
 	}
 
 
 	override fun readLong(): Long {
-		readToken(JSONToken.numberValue)
+		readToken(JsonToken.numberValue)
 
 		return readValue(checkBoundary = true) {
 			source.locked { parseLong() }
@@ -547,9 +547,9 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readMapEnd() {
-		readToken(JSONToken.mapEnd)
+		readToken(JsonToken.mapEnd)
 
-		source.readCharacter(JSONCharacter.Symbol.rightCurlyBracket)
+		source.readCharacter(JsonCharacter.Symbol.rightCurlyBracket)
 
 		popState()
 		didReadValue()
@@ -557,24 +557,24 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readMapStart() {
-		readToken(JSONToken.mapStart)
+		readToken(JsonToken.mapStart)
 
 		willReadValue()
 		pushState(tokenLocation = TokenLocation.afterMapStart)
 
-		source.readCharacter(JSONCharacter.Symbol.leftCurlyBracket)
+		source.readCharacter(JsonCharacter.Symbol.leftCurlyBracket)
 	}
 
 
 	override fun readNull(): Nothing? {
-		readToken(JSONToken.nullValue)
+		readToken(JsonToken.nullValue)
 
 		return readValue(checkBoundary = true) {
 			source.run {
-				readCharacter(JSONCharacter.Letter.n)
-				readCharacter(JSONCharacter.Letter.u)
-				readCharacter(JSONCharacter.Letter.l)
-				readCharacter(JSONCharacter.Letter.l)
+				readCharacter(JsonCharacter.Letter.n)
+				readCharacter(JsonCharacter.Letter.u)
+				readCharacter(JsonCharacter.Letter.l)
+				readCharacter(JsonCharacter.Letter.l)
 
 				null
 			}
@@ -583,7 +583,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readNumber(): Number {
-		readToken(JSONToken.numberValue)
+		readToken(JsonToken.numberValue)
 
 		return readValue(checkBoundary = true) {
 			val shouldParseAsFloatingPoint = parseNumberIntoBuffer()
@@ -602,12 +602,12 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	override fun readString(): String {
-		val token = readToken(JSONToken.stringValue, alternative = JSONToken.mapKey)
+		val token = readToken(JsonToken.stringValue, alternative = JsonToken.mapKey)
 
 		return readValue(checkBoundary = false) {
 			val string = source.locked { readStringLocked() }
 
-			if (token == JSONToken.mapKey) {
+			if (token == JsonToken.mapKey) {
 				state.currentValueMapKey = string
 			}
 
@@ -618,7 +618,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 	private fun readStringLocked(): String {
 		val source = source
-		source.readCharacter(JSONCharacter.Symbol.quotationMark)
+		source.readCharacter(JsonCharacter.Symbol.quotationMark)
 
 		val buffer = buffer
 		buffer.setLength(0)
@@ -628,7 +628,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 		do {
 			var character = source.readCharacter()
 			when (character) {
-				JSONCharacter.Symbol.reverseSolidus -> {
+				JsonCharacter.Symbol.reverseSolidus -> {
 					val endIndex = source.index - 1
 					if (endIndex > startIndex) {
 						buffer.append(source.buffer, startIndex, endIndex - startIndex)
@@ -636,30 +636,30 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 					character = source.readCharacter()
 					when (character) {
-						JSONCharacter.Symbol.reverseSolidus,
-						JSONCharacter.Symbol.solidus ->
+						JsonCharacter.Symbol.reverseSolidus,
+						JsonCharacter.Symbol.solidus ->
 							buffer.append(character.toChar())
 
-						JSONCharacter.Symbol.quotationMark -> {
+						JsonCharacter.Symbol.quotationMark -> {
 							buffer.append(character.toChar())
 							character = 0
 						}
 
-						JSONCharacter.Letter.b -> buffer.append('\b')
-						JSONCharacter.Letter.f -> buffer.append('\u000C')
-						JSONCharacter.Letter.n -> buffer.append('\n')
-						JSONCharacter.Letter.r -> buffer.append('\r')
-						JSONCharacter.Letter.t -> buffer.append('\t')
-						JSONCharacter.Letter.u -> {
-							val digit1 = source.readCharacter(required = JSONCharacter::isHexDigit) { "0-9, a-f or A-F" }
-							val digit2 = source.readCharacter(required = JSONCharacter::isHexDigit) { "0-9, a-f or A-F" }
-							val digit3 = source.readCharacter(required = JSONCharacter::isHexDigit) { "0-9, a-f or A-F" }
-							val digit4 = source.readCharacter(required = JSONCharacter::isHexDigit) { "0-9, a-f or A-F" }
-
-							val decodedCharacter = (JSONCharacter.parseHexDigit(digit1) shl 12) or
-								(JSONCharacter.parseHexDigit(digit2) shl 8) or
-								(JSONCharacter.parseHexDigit(digit3) shl 4) or
-								JSONCharacter.parseHexDigit(digit4)
+						JsonCharacter.Letter.b -> buffer.append('\b')
+						JsonCharacter.Letter.f -> buffer.append('\u000C')
+						JsonCharacter.Letter.n -> buffer.append('\n')
+						JsonCharacter.Letter.r -> buffer.append('\r')
+						JsonCharacter.Letter.t -> buffer.append('\t')
+						JsonCharacter.Letter.u -> {
+							val digit1 = source.readCharacter(required = JsonCharacter::isHexDigit) { "0-9, a-f or A-F" }
+							val digit2 = source.readCharacter(required = JsonCharacter::isHexDigit) { "0-9, a-f or A-F" }
+							val digit3 = source.readCharacter(required = JsonCharacter::isHexDigit) { "0-9, a-f or A-F" }
+							val digit4 = source.readCharacter(required = JsonCharacter::isHexDigit) { "0-9, a-f or A-F" }
+
+							val decodedCharacter = (JsonCharacter.parseHexDigit(digit1) shl 12) or
+								(JsonCharacter.parseHexDigit(digit2) shl 8) or
+								(JsonCharacter.parseHexDigit(digit3) shl 4) or
+								JsonCharacter.parseHexDigit(digit4)
 
 							buffer.append(decodedCharacter.toChar())
 						}
@@ -676,14 +676,14 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 				0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F ->
 					unexpectedCharacterError(actual = character, expected = "an escape sequence")
 
-				JSONCharacter.Symbol.quotationMark ->
+				JsonCharacter.Symbol.quotationMark ->
 					Unit
 
-				JSONCharacter.end ->
+				JsonCharacter.end ->
 					unexpectedCharacterError(actual = character, expected = "\"")
 			}
 		}
-		while (character != JSONCharacter.Symbol.quotationMark)
+		while (character != JsonCharacter.Symbol.quotationMark)
 
 		val endIndex = source.index - 1
 		if (endIndex > startIndex) {
@@ -694,7 +694,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 	}
 
 
-	private fun readToken(required: JSONToken) {
+	private fun readToken(required: JsonToken) {
 		val token = nextToken
 		if (token != required) {
 			unexpectedTokenError(
@@ -710,7 +710,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	@Suppress("SameParameterValue")
-	private fun <Token : JSONToken?> readToken(required: Token, alternative: Token): Token {
+	private fun <Token : JsonToken?> readToken(required: Token, alternative: Token): Token {
 		val token = nextToken
 		if (token != required && token != alternative) {
 			unexpectedTokenError(
@@ -735,7 +735,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 		if (checkBoundary) {
 			val nextCharacter = source.peekCharacter()
-			if (!JSONCharacter.isValueBoundary(nextCharacter)) {
+			if (!JsonCharacter.isValueBoundary(nextCharacter)) {
 				unexpectedCharacterError(actual = nextCharacter, expected = "end of value")
 			}
 		}
@@ -753,31 +753,31 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 		close()
 
 		if (nextToken != null)
-			throw JSONException.Syntax(
+			throw JsonException.Syntax(
 				message = "expected end of input but found token $nextToken",
 				offset = source.sourceIndex,
-				path = JSONPath.root
+				path = JsonPath.root
 			)
 	}
 
 
 	private fun unexpectedCharacterError(actual: Int, expected: String, offset: Int = source.sourceIndex): Nothing =
-		throw if (offset == 0 && actual == JSONCharacter.end)
-			JSONException.Syntax(
+		throw if (offset == 0 && actual == JsonCharacter.end)
+			JsonException.Syntax(
 				message = "Cannot parse empty JSON data",
 				offset = 0,
-				path = JSONPath.root
+				path = JsonPath.root
 			)
 		else
-			JSONException.Syntax(
-				message = "unexpected ${JSONCharacter.toString(actual)}, expected $expected",
+			JsonException.Syntax(
+				message = "unexpected ${JsonCharacter.toString(actual)}, expected $expected",
 				offset = offset,
 				path = path
 			)
 
 
-	private fun unexpectedTokenError(actual: JSONToken?, expected: String, offset: Int = source.sourceIndex): Nothing {
-		throw JSONException.Syntax(
+	private fun unexpectedTokenError(actual: JsonToken?, expected: String, offset: Int = source.sourceIndex): Nothing {
+		throw JsonException.Syntax(
 			message = "Unexpected $actual, expected $expected",
 			offset = offset,
 			path = path
@@ -795,7 +795,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	private fun valueIsolationError(message: String): Nothing {
-		throw JSONException.Parsing(
+		throw JsonException.Parsing(
 			message = "Value isolation failed: $message",
 			offset = offset,
 			path = path
@@ -809,7 +809,7 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 
 
 	private fun TextInput.readCharacter(required: Int) =
-		readCharacter(required) { JSONCharacter.toString(required) }
+		readCharacter(required) { JsonCharacter.toString(required) }
 
 
 	private inline fun TextInput.readCharacter(required: Int, crossinline expected: () -> String): Int {
@@ -863,9 +863,9 @@ internal class StandardReader(private val source: TextInput) : JSONReader {
 		}
 
 
-		fun toPathElement(): JSONPath.Element? {
-			if (currentValueListIndex >= 0) return JSONPath.Element.ListIndex(currentValueListIndex)
-			currentValueMapKey?.let { return JSONPath.Element.MapKey(it) }
+		fun toPathElement(): JsonPath.Element? {
+			if (currentValueListIndex >= 0) return JsonPath.Element.ListIndex(currentValueListIndex)
+			currentValueMapKey?.let { return JsonPath.Element.MapKey(it) }
 
 			return null
 		}
diff --git a/basic/sources/implementations/StandardSerializer.kt b/basic/sources/implementations/StandardSerializer.kt
index c9b6faa..ec3abfd 100644
--- a/basic/sources/implementations/StandardSerializer.kt
+++ b/basic/sources/implementations/StandardSerializer.kt
@@ -1,14 +1,14 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal object StandardSerializer : JSONSerializer {
+internal object StandardSerializer : JsonSerializer {
 
-	override fun serializeValue(value: Any?, destination: JSONWriter, withTermination: Boolean) {
+	override fun serializeValue(value: Any?, destination: JsonWriter, withTermination: Boolean) {
 		destination.withTermination(withTermination) { serializeValueUnterminated(value, destination) }
 	}
 
 
-	private fun serializeValueUnterminated(value: Any?, destination: JSONWriter) {
+	private fun serializeValueUnterminated(value: Any?, destination: JsonWriter) {
 		var currentIterator: Iterator<*>? = null
 		var currentValue: Any? = value
 		var isInMap = false
@@ -17,7 +17,7 @@ internal object StandardSerializer : JSONSerializer {
 		var isInMapElementValue = false
 
 		fun serializationError(message: String): Nothing =
-			throw JSONException.Serialization(message = message, path = destination.path)
+			throw JsonException.Serialization(message = message, path = destination.path)
 
 
 		loop@ do {
diff --git a/basic/sources/implementations/StandardWriter.kt b/basic/sources/implementations/StandardWriter.kt
index bf0497e..9d70e1e 100644
--- a/basic/sources/implementations/StandardWriter.kt
+++ b/basic/sources/implementations/StandardWriter.kt
@@ -1,10 +1,10 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.io.*
 
 
 internal class StandardWriter(private val destination: Writer)
-	: JSONWriter, Closeable, Flushable by destination {
+	: JsonWriter, Closeable, Flushable by destination {
 
 	private var isClosed = false
 	private var state = State()
@@ -23,7 +23,7 @@ internal class StandardWriter(private val destination: Writer)
 	}
 
 
-	override fun beginValueIsolation(): JSONDepth {
+	override fun beginValueIsolation(): JsonDepth {
 		ensureNotClosed()
 
 		valueIsolationCheck(state.tokenLocation != TokenLocation.afterRootValue) { "the root value has already been written" }
@@ -36,7 +36,7 @@ internal class StandardWriter(private val destination: Writer)
 
 
 	override val depth
-		get() = JSONDepth(stateStack.size - 1)
+		get() = JsonDepth(stateStack.size - 1)
 
 
 	private fun didWriteValue() {
@@ -58,7 +58,7 @@ internal class StandardWriter(private val destination: Writer)
 	}
 
 
-	override fun endValueIsolation(depth: JSONDepth) {
+	override fun endValueIsolation(depth: JsonDepth) {
 		ensureNotClosed()
 
 		valueIsolationCheck(depth <= this.depth) { "lists or maps have been ended prematurely" }
@@ -76,7 +76,7 @@ internal class StandardWriter(private val destination: Writer)
 
 
 	private fun ensureNotClosed() {
-		serializationCheck(!isClosed) { "Cannot operate on a closed JSONWriter" }
+		serializationCheck(!isClosed) { "Cannot operate on a closed JsonWriter" }
 	}
 
 
@@ -91,17 +91,17 @@ internal class StandardWriter(private val destination: Writer)
 	}
 
 
-	override val path: JSONPath
+	override val path: JsonPath
 		get() {
-			if (isClosed) return JSONPath.root
+			if (isClosed) return JsonPath.root
 
 			return when (state.tokenLocation) {
 				TokenLocation.afterRootValue,
 				TokenLocation.beforeRootValue ->
-					JSONPath.root
+					JsonPath.root
 
 				else ->
-					JSONPath(elements = stateStack.mapNotNull { it.toPathElement() })
+					JsonPath(elements = stateStack.mapNotNull { it.toPathElement() })
 			}
 		}
 
@@ -136,7 +136,7 @@ internal class StandardWriter(private val destination: Writer)
 
 
 	private fun serializationError(message: String): Nothing =
-		throw JSONException.Serialization(message = message, path = path)
+		throw JsonException.Serialization(message = message, path = path)
 
 
 	override fun terminate() {
@@ -145,7 +145,7 @@ internal class StandardWriter(private val destination: Writer)
 
 		withErrorChecking {
 			if (state.tokenLocation != TokenLocation.afterRootValue)
-				serializationError("JSONWriter was terminated without writing a complete value")
+				serializationError("JsonWriter was terminated without writing a complete value")
 		}
 	}
 
@@ -160,7 +160,7 @@ internal class StandardWriter(private val destination: Writer)
 
 
 	private fun valueIsolationError(message: String): Nothing {
-		throw JSONException.Serialization(
+		throw JsonException.Serialization(
 			message = "Value isolation failed: $message",
 			path = path
 		)
@@ -174,7 +174,7 @@ internal class StandardWriter(private val destination: Writer)
 
 		when (state.tokenLocation) {
 			TokenLocation.afterListElement ->
-				destination.write(JSONCharacter.Symbol.comma)
+				destination.write(JsonCharacter.Symbol.comma)
 
 			TokenLocation.afterListStart ->
 				Unit
@@ -182,11 +182,11 @@ internal class StandardWriter(private val destination: Writer)
 			TokenLocation.afterMapElement -> {
 				serializationCheck(isString) { "Expected a string as map key" }
 
-				destination.write(JSONCharacter.Symbol.comma)
+				destination.write(JsonCharacter.Symbol.comma)
 			}
 
 			TokenLocation.afterMapKey ->
-				destination.write(JSONCharacter.Symbol.colon)
+				destination.write(JsonCharacter.Symbol.colon)
 
 			TokenLocation.afterMapStart ->
 				serializationCheck(isString) { "Expected a string as map key" }
@@ -259,7 +259,7 @@ internal class StandardWriter(private val destination: Writer)
 					serializationError("Cannot write end of list when not in a list")
 			}
 
-			destination.write(JSONCharacter.Symbol.rightSquareBracket)
+			destination.write(JsonCharacter.Symbol.rightSquareBracket)
 
 			popState()
 			didWriteValue()
@@ -271,7 +271,7 @@ internal class StandardWriter(private val destination: Writer)
 		withErrorChecking {
 			willWriteValue(isString = false)
 
-			destination.write(JSONCharacter.Symbol.leftSquareBracket)
+			destination.write(JsonCharacter.Symbol.leftSquareBracket)
 
 			pushState(tokenLocation = TokenLocation.afterListStart)
 
@@ -296,7 +296,7 @@ internal class StandardWriter(private val destination: Writer)
 					serializationError("Cannot write end of map when not in a map")
 			}
 
-			destination.write(JSONCharacter.Symbol.rightCurlyBracket)
+			destination.write(JsonCharacter.Symbol.rightCurlyBracket)
 
 			popState()
 			didWriteValue()
@@ -308,7 +308,7 @@ internal class StandardWriter(private val destination: Writer)
 		withErrorChecking {
 			willWriteValue(isString = false)
 
-			destination.write(JSONCharacter.Symbol.leftCurlyBracket)
+			destination.write(JsonCharacter.Symbol.leftCurlyBracket)
 
 			pushState(tokenLocation = TokenLocation.afterMapStart)
 		}
@@ -339,54 +339,54 @@ internal class StandardWriter(private val destination: Writer)
 			}
 
 			// TODO optimize
-			destination.write(JSONCharacter.Symbol.quotationMark)
+			destination.write(JsonCharacter.Symbol.quotationMark)
 
 			for (character in value) {
 				when (character) {
 					'"', '\\' -> {
-						destination.write(JSONCharacter.Symbol.reverseSolidus)
+						destination.write(JsonCharacter.Symbol.reverseSolidus)
 						destination.write(character.toInt())
 					}
 
 					'\b' -> {
-						destination.write(JSONCharacter.Symbol.reverseSolidus)
-						destination.write(JSONCharacter.Letter.b)
+						destination.write(JsonCharacter.Symbol.reverseSolidus)
+						destination.write(JsonCharacter.Letter.b)
 					}
 
 					'\u000C' -> {
-						destination.write(JSONCharacter.Symbol.reverseSolidus)
-						destination.write(JSONCharacter.Letter.f)
+						destination.write(JsonCharacter.Symbol.reverseSolidus)
+						destination.write(JsonCharacter.Letter.f)
 					}
 
 					'\n' -> {
-						destination.write(JSONCharacter.Symbol.reverseSolidus)
-						destination.write(JSONCharacter.Letter.n)
+						destination.write(JsonCharacter.Symbol.reverseSolidus)
+						destination.write(JsonCharacter.Letter.n)
 					}
 
 					'\r' -> {
-						destination.write(JSONCharacter.Symbol.reverseSolidus)
-						destination.write(JSONCharacter.Letter.r)
+						destination.write(JsonCharacter.Symbol.reverseSolidus)
+						destination.write(JsonCharacter.Letter.r)
 					}
 
 					'\t' -> {
-						destination.write(JSONCharacter.Symbol.reverseSolidus)
-						destination.write(JSONCharacter.Letter.t)
+						destination.write(JsonCharacter.Symbol.reverseSolidus)
+						destination.write(JsonCharacter.Letter.t)
 					}
 
 					'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', '\u0006', '\u0007',
 					'\u000B', '\u000E', '\u000F', '\u0010', '\u0011', '\u0012', '\u0013', '\u0014',
 					'\u0015', '\u0016', '\u0017', '\u0018', '\u0019', '\u001A', '\u001B', '\u001C',
 					'\u001D', '\u001E', '\u001F' -> {
-						destination.write(JSONCharacter.Symbol.reverseSolidus)
-						destination.write(JSONCharacter.Letter.u)
-						destination.write(JSONCharacter.Digit.zero)
-						destination.write(JSONCharacter.Digit.zero)
+						destination.write(JsonCharacter.Symbol.reverseSolidus)
+						destination.write(JsonCharacter.Letter.u)
+						destination.write(JsonCharacter.Digit.zero)
+						destination.write(JsonCharacter.Digit.zero)
 
 						if (character.toInt() >= 0x10) {
-							destination.write(JSONCharacter.Digit.one)
+							destination.write(JsonCharacter.Digit.one)
 						}
 						else {
-							destination.write(JSONCharacter.Digit.zero)
+							destination.write(JsonCharacter.Digit.zero)
 						}
 
 						destination.write(hexCharacters[character.toInt() and 0xF].toInt())
@@ -397,7 +397,7 @@ internal class StandardWriter(private val destination: Writer)
 				}
 			}
 
-			destination.write(JSONCharacter.Symbol.quotationMark)
+			destination.write(JsonCharacter.Symbol.quotationMark)
 		}
 	}
 
@@ -440,9 +440,9 @@ internal class StandardWriter(private val destination: Writer)
 		}
 
 
-		fun toPathElement(): JSONPath.Element? {
-			if (currentValueListIndex >= 0) return JSONPath.Element.ListIndex(currentValueListIndex)
-			currentValueMapKey?.let { return JSONPath.Element.MapKey(it) }
+		fun toPathElement(): JsonPath.Element? {
+			if (currentValueListIndex >= 0) return JsonPath.Element.ListIndex(currentValueListIndex)
+			currentValueMapKey?.let { return JsonPath.Element.MapKey(it) }
 
 			return null
 		}
diff --git a/basic/sources/utility/JSONCharacter.kt b/basic/sources/utility/JsonCharacter.kt
similarity index 53%
rename from basic/sources/utility/JSONCharacter.kt
rename to basic/sources/utility/JsonCharacter.kt
index c7aa381..c810a24 100644
--- a/basic/sources/utility/JSONCharacter.kt
+++ b/basic/sources/utility/JsonCharacter.kt
@@ -1,7 +1,7 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal object JSONCharacter {
+internal object JsonCharacter {
 
 	object Digit {
 
@@ -76,88 +76,88 @@ internal object JSONCharacter {
 
 	fun isHexDigit(character: Int) =
 		when (character) {
-			JSONCharacter.Digit.zero,
-			JSONCharacter.Digit.one,
-			JSONCharacter.Digit.two,
-			JSONCharacter.Digit.three,
-			JSONCharacter.Digit.four,
-			JSONCharacter.Digit.five,
-			JSONCharacter.Digit.six,
-			JSONCharacter.Digit.seven,
-			JSONCharacter.Digit.eight,
-			JSONCharacter.Digit.nine,
-			JSONCharacter.Letter.a,
-			JSONCharacter.Letter.b,
-			JSONCharacter.Letter.c,
-			JSONCharacter.Letter.d,
-			JSONCharacter.Letter.e,
-			JSONCharacter.Letter.f,
-			JSONCharacter.Letter.A,
-			JSONCharacter.Letter.B,
-			JSONCharacter.Letter.C,
-			JSONCharacter.Letter.D,
-			JSONCharacter.Letter.E,
-			JSONCharacter.Letter.F -> true
+			JsonCharacter.Digit.zero,
+			JsonCharacter.Digit.one,
+			JsonCharacter.Digit.two,
+			JsonCharacter.Digit.three,
+			JsonCharacter.Digit.four,
+			JsonCharacter.Digit.five,
+			JsonCharacter.Digit.six,
+			JsonCharacter.Digit.seven,
+			JsonCharacter.Digit.eight,
+			JsonCharacter.Digit.nine,
+			JsonCharacter.Letter.a,
+			JsonCharacter.Letter.b,
+			JsonCharacter.Letter.c,
+			JsonCharacter.Letter.d,
+			JsonCharacter.Letter.e,
+			JsonCharacter.Letter.f,
+			JsonCharacter.Letter.A,
+			JsonCharacter.Letter.B,
+			JsonCharacter.Letter.C,
+			JsonCharacter.Letter.D,
+			JsonCharacter.Letter.E,
+			JsonCharacter.Letter.F -> true
 			else -> false
 		}
 
 
 	fun isValueBoundary(character: Int) =
 		when (character) {
-			JSONCharacter.end,
-			JSONCharacter.Symbol.colon,
-			JSONCharacter.Symbol.comma,
-			JSONCharacter.Symbol.leftCurlyBracket,
-			JSONCharacter.Symbol.leftSquareBracket,
-			JSONCharacter.Symbol.rightCurlyBracket,
-			JSONCharacter.Symbol.rightSquareBracket,
-			JSONCharacter.Whitespace.carriageReturn,
-			JSONCharacter.Whitespace.characterTabulation,
-			JSONCharacter.Whitespace.lineFeed,
-			JSONCharacter.Whitespace.space -> true
+			JsonCharacter.end,
+			JsonCharacter.Symbol.colon,
+			JsonCharacter.Symbol.comma,
+			JsonCharacter.Symbol.leftCurlyBracket,
+			JsonCharacter.Symbol.leftSquareBracket,
+			JsonCharacter.Symbol.rightCurlyBracket,
+			JsonCharacter.Symbol.rightSquareBracket,
+			JsonCharacter.Whitespace.carriageReturn,
+			JsonCharacter.Whitespace.characterTabulation,
+			JsonCharacter.Whitespace.lineFeed,
+			JsonCharacter.Whitespace.space -> true
 			else -> false
 		}
 
 
 	fun isWhitespace(character: Int) =
 		when (character) {
-			JSONCharacter.Whitespace.carriageReturn,
-			JSONCharacter.Whitespace.characterTabulation,
-			JSONCharacter.Whitespace.lineFeed,
-			JSONCharacter.Whitespace.space -> true
+			JsonCharacter.Whitespace.carriageReturn,
+			JsonCharacter.Whitespace.characterTabulation,
+			JsonCharacter.Whitespace.lineFeed,
+			JsonCharacter.Whitespace.space -> true
 			else -> false
 		}
 
 
 	fun parseHexDigit(character: Int) =
 		when (character) {
-			JSONCharacter.Digit.zero,
-			JSONCharacter.Digit.one,
-			JSONCharacter.Digit.two,
-			JSONCharacter.Digit.three,
-			JSONCharacter.Digit.four,
-			JSONCharacter.Digit.five,
-			JSONCharacter.Digit.six,
-			JSONCharacter.Digit.seven,
-			JSONCharacter.Digit.eight,
-			JSONCharacter.Digit.nine ->
-				character - JSONCharacter.Digit.zero
-
-			JSONCharacter.Letter.a,
-			JSONCharacter.Letter.b,
-			JSONCharacter.Letter.c,
-			JSONCharacter.Letter.d,
-			JSONCharacter.Letter.e,
-			JSONCharacter.Letter.f ->
-				character - JSONCharacter.Letter.a + 10
-
-			JSONCharacter.Letter.A,
-			JSONCharacter.Letter.B,
-			JSONCharacter.Letter.C,
-			JSONCharacter.Letter.D,
-			JSONCharacter.Letter.E,
-			JSONCharacter.Letter.F ->
-				character - JSONCharacter.Letter.A + 10
+			JsonCharacter.Digit.zero,
+			JsonCharacter.Digit.one,
+			JsonCharacter.Digit.two,
+			JsonCharacter.Digit.three,
+			JsonCharacter.Digit.four,
+			JsonCharacter.Digit.five,
+			JsonCharacter.Digit.six,
+			JsonCharacter.Digit.seven,
+			JsonCharacter.Digit.eight,
+			JsonCharacter.Digit.nine ->
+				character - JsonCharacter.Digit.zero
+
+			JsonCharacter.Letter.a,
+			JsonCharacter.Letter.b,
+			JsonCharacter.Letter.c,
+			JsonCharacter.Letter.d,
+			JsonCharacter.Letter.e,
+			JsonCharacter.Letter.f ->
+				character - JsonCharacter.Letter.a + 10
+
+			JsonCharacter.Letter.A,
+			JsonCharacter.Letter.B,
+			JsonCharacter.Letter.C,
+			JsonCharacter.Letter.D,
+			JsonCharacter.Letter.E,
+			JsonCharacter.Letter.F ->
+				character - JsonCharacter.Letter.A + 10
 
 			else ->
 				throw IllegalArgumentException("${toString(character)} is not a hex digit.")
diff --git a/basic/sources/utility/TextInput.kt b/basic/sources/utility/TextInput.kt
index a9af99f..d250dd7 100644
--- a/basic/sources/utility/TextInput.kt
+++ b/basic/sources/utility/TextInput.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.io.*
 import kotlin.contracts.*
@@ -67,14 +67,14 @@ internal class TextInput(private val source: Reader) : Closeable by source {
 		if (tryPreloadCharacters(1) > 0)
 			buffer[bufferStartIndex].toInt()
 		else
-			JSONCharacter.end
+			JsonCharacter.end
 
 
 	fun readCharacter(): Int {
 		val character = if (tryPreloadCharacters(1) > 0)
 			buffer[bufferStartIndex].toInt()
 		else
-			JSONCharacter.end
+			JsonCharacter.end
 
 		bufferStartIndex += 1
 
@@ -117,7 +117,7 @@ internal class TextInput(private val source: Reader) : Closeable by source {
 			val character = buffer[bufferStartIndex].toInt()
 			bufferStartIndex += 1
 		}
-		while (JSONCharacter.isWhitespace(character))
+		while (JsonCharacter.isWhitespace(character))
 
 		this.bufferStartIndex = bufferStartIndex - 1
 	}
diff --git a/basic/tests/sources/CompanionTest.kt b/basic/tests/sources/CompanionTest.kt
index e02dab4..327193e 100644
--- a/basic/tests/sources/CompanionTest.kt
+++ b/basic/tests/sources/CompanionTest.kt
@@ -1,6 +1,6 @@
 package tests.basic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
@@ -10,14 +10,14 @@ internal object CompanionTest {
 	fun testInitialization() {
 		// just make sure all companions initialize properly and we get more code coverage :)
 		listOf(
-			JSONException.Companion,
-			JSONReader.Companion,
-			JSONToken.Companion,
-			JSONWriter.Companion
+			JsonException.Companion,
+			JsonReader.Companion,
+			JsonToken.Companion,
+			JsonWriter.Companion
 		)
 
 		// trigger initialization of Character.* objects to make code coverage happy
-		JSONCharacter::class.nestedClasses.forEach {
+		JsonCharacter::class.nestedClasses.forEach {
 			try {
 				it.objectInstance
 			}
diff --git a/basic/tests/sources/JSONCharacterTest.kt b/basic/tests/sources/JsonCharacterTest.kt
similarity index 68%
rename from basic/tests/sources/JSONCharacterTest.kt
rename to basic/tests/sources/JsonCharacterTest.kt
index bba46ed..2af4a76 100644
--- a/basic/tests/sources/JSONCharacterTest.kt
+++ b/basic/tests/sources/JsonCharacterTest.kt
@@ -2,17 +2,17 @@ package tests.basic
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
-internal object JSONCharacterTest {
+internal object JsonCharacterTest {
 
 	@Test
 	fun testIsControl() {
 		val boundaries = (0 .. 0x1F).toSet()
 		for (character in 0 .. 0xFF)
-			assert(JSONCharacter.isControl(character)).toBe(boundaries.contains(character))
+			assert(JsonCharacter.isControl(character)).toBe(boundaries.contains(character))
 	}
 
 
@@ -20,10 +20,10 @@ internal object JSONCharacterTest {
 	fun testIsDigit() {
 		val boundaries = setOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9')
 		for (character in 0 .. 0xFF) {
-			assert(JSONCharacter.isDigit(character)).toBe(boundaries.contains(character.toChar()))
+			assert(JsonCharacter.isDigit(character)).toBe(boundaries.contains(character.toChar()))
 		}
 
-		assert(JSONCharacter.isDigit(JSONCharacter.end)).toBe(false)
+		assert(JsonCharacter.isDigit(JsonCharacter.end)).toBe(false)
 	}
 
 
@@ -35,10 +35,10 @@ internal object JSONCharacterTest {
 			'A', 'B', 'C', 'D', 'E', 'F'
 		)
 		for (character in 0 .. 0xFF) {
-			assert(JSONCharacter.isHexDigit(character)).toBe(boundaries.contains(character.toChar()))
+			assert(JsonCharacter.isHexDigit(character)).toBe(boundaries.contains(character.toChar()))
 		}
 
-		assert(JSONCharacter.isHexDigit(JSONCharacter.end)).toBe(false)
+		assert(JsonCharacter.isHexDigit(JsonCharacter.end)).toBe(false)
 	}
 
 
@@ -46,10 +46,10 @@ internal object JSONCharacterTest {
 	fun testIsValueBoundary() {
 		val boundaries = setOf(',', ':', ',', '{', '[', '}', ']', '\r', '\t', '\n', ' ')
 		for (character in 0 .. 0xFF) {
-			assert(JSONCharacter.isValueBoundary(character)).toBe(boundaries.contains(character.toChar()))
+			assert(JsonCharacter.isValueBoundary(character)).toBe(boundaries.contains(character.toChar()))
 		}
 
-		assert(JSONCharacter.isValueBoundary(JSONCharacter.end)).toBe(true)
+		assert(JsonCharacter.isValueBoundary(JsonCharacter.end)).toBe(true)
 	}
 
 
@@ -57,10 +57,10 @@ internal object JSONCharacterTest {
 	fun testIsWhitespace() {
 		val boundaries = setOf(' ', '\n', '\r', '\t')
 		for (character in 0 .. 0xFF) {
-			assert(JSONCharacter.isWhitespace(character)).toBe(boundaries.contains(character.toChar()))
+			assert(JsonCharacter.isWhitespace(character)).toBe(boundaries.contains(character.toChar()))
 		}
 
-		assert(JSONCharacter.isWhitespace(JSONCharacter.end)).toBe(false)
+		assert(JsonCharacter.isWhitespace(JsonCharacter.end)).toBe(false)
 	}
 
 
@@ -74,11 +74,11 @@ internal object JSONCharacterTest {
 		for (character in 0 .. 0xFF) {
 			val expectValue = expectValues[character.toChar()]
 			if (expectValue != null) {
-				assert(JSONCharacter.parseHexDigit(character)).toBe(expectValue)
+				assert(JsonCharacter.parseHexDigit(character)).toBe(expectValue)
 			}
 			else {
 				try {
-					JSONCharacter.parseHexDigit(character)
+					JsonCharacter.parseHexDigit(character)
 					throw AssertionError("Character.parseHexDigit() should fail for '$character'")
 				}
 				catch (e: Exception) {
@@ -88,7 +88,7 @@ internal object JSONCharacterTest {
 		}
 
 		try {
-			JSONCharacter.parseHexDigit(JSONCharacter.end)
+			JsonCharacter.parseHexDigit(JsonCharacter.end)
 			throw AssertionError("Character.parseHexDigit() should fail for Character.end")
 		}
 		catch (e: Exception) {
diff --git a/basic/tests/sources/JSONReaderTest.kt b/basic/tests/sources/JsonReaderTest.kt
similarity index 77%
rename from basic/tests/sources/JSONReaderTest.kt
rename to basic/tests/sources/JsonReaderTest.kt
index 4988d49..ca090d0 100644
--- a/basic/tests/sources/JSONReaderTest.kt
+++ b/basic/tests/sources/JsonReaderTest.kt
@@ -5,11 +5,11 @@ import ch.tutteli.atrium.verbs.*
 import org.junit.jupiter.api.*
 
 
-internal object JSONReaderTest {
+internal object JsonReaderTest {
 
 	@Test
 	fun testDefaultReadDelegations() {
-		val reader = object : DummyJSONReader() {
+		val reader = object : DummyJsonReader() {
 			override fun readDouble() = 10.0
 		}
 
diff --git a/basic/tests/sources/JSONTestSuite.kt b/basic/tests/sources/JsonTestSuite.kt
similarity index 87%
rename from basic/tests/sources/JSONTestSuite.kt
rename to basic/tests/sources/JsonTestSuite.kt
index 89e4fb5..3e8f5bf 100644
--- a/basic/tests/sources/JSONTestSuite.kt
+++ b/basic/tests/sources/JsonTestSuite.kt
@@ -1,15 +1,15 @@
 package tests.basic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
 
 @DisplayName("JSON Test Suite (https://github.com/nst/JSONTestSuite)")
-internal object JSONTestSuite {
+internal object JsonTestSuite {
 
 	private val environments = listOf(
-		TestEnvironment("JSONParser", JSONParser.default, parserIsRecursive = false)
+		TestEnvironment("JsonParser", JsonParser.default, parserIsRecursive = false)
 	)
 
 
@@ -24,14 +24,14 @@ internal object JSONTestSuite {
 			val result = try {
 				environment.parser.parseValueOrNull(FileReader(file))
 			}
-			catch (e: JSONException) {
+			catch (e: JsonException) {
 				e
 			}
 			catch (e: StackOverflowError) {
 				throw AssertionError("Stack overflow in '${file.name}'")
 			}
 
-			val actualBehavior = if (result is JSONException) Behavior.rejected else Behavior.accepted
+			val actualBehavior = if (result is JsonException) Behavior.rejected else Behavior.accepted
 			val expectedBehavior = when (file.name.substringBefore('_')) {
 				"i" -> null
 				"n" -> Behavior.rejected
@@ -74,7 +74,7 @@ internal object JSONTestSuite {
 
 	private class TestEnvironment(
 		val name: String,
-		val parser: JSONParser,
+		val parser: JsonParser,
 		val parserIsRecursive: Boolean
 	)
 }
diff --git a/basic/tests/sources/JSONWriterTest.kt b/basic/tests/sources/JsonWriterTest.kt
similarity index 87%
rename from basic/tests/sources/JSONWriterTest.kt
rename to basic/tests/sources/JsonWriterTest.kt
index 5db3ed6..e05dbc8 100644
--- a/basic/tests/sources/JSONWriterTest.kt
+++ b/basic/tests/sources/JsonWriterTest.kt
@@ -2,16 +2,16 @@ package tests.basic
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
 
-internal object JSONWriterTest {
+internal object JsonWriterTest {
 
 	@Test
 	fun testWithErrorChecking() {
-		val writer = JSONWriter.build(StringWriter())
+		val writer = JsonWriter.build(StringWriter())
 		assert(writer.isErrored).toBe(false)
 		assert(writer.withErrorChecking { "test" }).toBe("test")
 		assert(writer.isErrored).toBe(false)
@@ -28,7 +28,7 @@ internal object JSONWriterTest {
 			writer.withErrorChecking { }
 			throw AssertionError(".withErrorChecking() throw when errored")
 		}
-		catch (e: JSONException) {
+		catch (e: JsonException) {
 			assert(writer.isErrored).toBe(true)
 		}
 	}
@@ -40,7 +40,7 @@ internal object JSONWriterTest {
 		var longValue: Long? = null
 		var stringValue: String? = null
 
-		val writer = object : DummyJSONWriter() {
+		val writer = object : DummyJsonWriter() {
 
 			override fun writeDouble(value: Double) {
 				doubleValue = value
diff --git a/basic/tests/sources/StandardReaderAcceptTest.kt b/basic/tests/sources/StandardReaderAcceptTest.kt
index e1d2cf8..ce17f23 100644
--- a/basic/tests/sources/StandardReaderAcceptTest.kt
+++ b/basic/tests/sources/StandardReaderAcceptTest.kt
@@ -2,19 +2,10 @@ package tests.basic
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
-import kotlin.collections.associate
-import kotlin.collections.emptyList
-import kotlin.collections.emptyMap
-import kotlin.collections.listOf
-import kotlin.collections.mapOf
-import kotlin.collections.mutableListOf
-import kotlin.collections.mutableMapOf
-import kotlin.collections.plusAssign
 import kotlin.collections.set
-import kotlin.collections.toList
 
 
 internal class StandardReaderAcceptTest {
@@ -438,7 +429,7 @@ internal class StandardReaderAcceptTest {
 	fun testReadListEnd() {
 		reader("[]").apply {
 			readListStart()
-			assert(nextToken).toBe(JSONToken.listEnd)
+			assert(nextToken).toBe(JsonToken.listEnd)
 			readListEnd()
 			assert(nextToken).toBe(null)
 		}
@@ -469,9 +460,9 @@ internal class StandardReaderAcceptTest {
 	@Test
 	fun testReadListStart() {
 		reader("[]").apply {
-			assert(nextToken).toBe(JSONToken.listStart)
+			assert(nextToken).toBe(JsonToken.listStart)
 			readListStart()
-			assert(nextToken).toBe(JSONToken.listEnd)
+			assert(nextToken).toBe(JsonToken.listEnd)
 		}
 	}
 
@@ -582,7 +573,7 @@ internal class StandardReaderAcceptTest {
 	fun testReadMapEnd() {
 		reader("{}").apply {
 			readMapStart()
-			assert(nextToken).toBe(JSONToken.mapEnd)
+			assert(nextToken).toBe(JsonToken.mapEnd)
 			readMapEnd()
 			assert(nextToken).toBe(null)
 		}
@@ -685,9 +676,9 @@ internal class StandardReaderAcceptTest {
 	@Test
 	fun testReadMapStart() {
 		reader("{}").apply {
-			assert(nextToken).toBe(JSONToken.mapStart)
+			assert(nextToken).toBe(JsonToken.mapStart)
 			readMapStart()
-			assert(nextToken).toBe(JSONToken.mapEnd)
+			assert(nextToken).toBe(JsonToken.mapEnd)
 		}
 	}
 
@@ -880,23 +871,23 @@ internal class StandardReaderAcceptTest {
 	fun testSkipValue() {
 		reader("[null, 0, [], {}, \"\", {\"\":true}]").apply {
 			readFromList {
-				assert(nextToken).toBe(JSONToken.nullValue)
+				assert(nextToken).toBe(JsonToken.nullValue)
 				skipValue()
-				assert(nextToken).toBe(JSONToken.numberValue)
+				assert(nextToken).toBe(JsonToken.numberValue)
 				skipValue()
-				assert(nextToken).toBe(JSONToken.listStart)
+				assert(nextToken).toBe(JsonToken.listStart)
 				skipValue()
-				assert(nextToken).toBe(JSONToken.mapStart)
+				assert(nextToken).toBe(JsonToken.mapStart)
 				skipValue()
-				assert(nextToken).toBe(JSONToken.stringValue)
+				assert(nextToken).toBe(JsonToken.stringValue)
 				skipValue()
-				assert(nextToken).toBe(JSONToken.mapStart)
+				assert(nextToken).toBe(JsonToken.mapStart)
 				readFromMap {
-					assert(nextToken).toBe(JSONToken.mapKey)
+					assert(nextToken).toBe(JsonToken.mapKey)
 					skipValue()
-					assert(nextToken).toBe(JSONToken.booleanValue)
+					assert(nextToken).toBe(JsonToken.booleanValue)
 					skipValue()
-					assert(nextToken).toBe(JSONToken.mapEnd)
+					assert(nextToken).toBe(JsonToken.mapEnd)
 				}
 			}
 		}
@@ -917,51 +908,51 @@ internal class StandardReaderAcceptTest {
 
 		@Test
 		fun testMatchesFullToken() {
-			assert(reader("null").nextToken).toBe(JSONToken.nullValue)
-			assert(reader("true").nextToken).toBe(JSONToken.booleanValue)
-			assert(reader("false").nextToken).toBe(JSONToken.booleanValue)
-			assert(reader("0").nextToken).toBe(JSONToken.numberValue)
-			assert(reader("1").nextToken).toBe(JSONToken.numberValue)
-			assert(reader("-1.0").nextToken).toBe(JSONToken.numberValue)
-			assert(reader("\"\"").nextToken).toBe(JSONToken.stringValue)
+			assert(reader("null").nextToken).toBe(JsonToken.nullValue)
+			assert(reader("true").nextToken).toBe(JsonToken.booleanValue)
+			assert(reader("false").nextToken).toBe(JsonToken.booleanValue)
+			assert(reader("0").nextToken).toBe(JsonToken.numberValue)
+			assert(reader("1").nextToken).toBe(JsonToken.numberValue)
+			assert(reader("-1.0").nextToken).toBe(JsonToken.numberValue)
+			assert(reader("\"\"").nextToken).toBe(JsonToken.stringValue)
 			reader("[]").apply {
-				assert(nextToken).toBe(JSONToken.listStart)
+				assert(nextToken).toBe(JsonToken.listStart)
 				readListStart()
-				assert(nextToken).toBe(JSONToken.listEnd)
+				assert(nextToken).toBe(JsonToken.listEnd)
 			}
 			reader("{}").apply {
-				assert(nextToken).toBe(JSONToken.mapStart)
+				assert(nextToken).toBe(JsonToken.mapStart)
 				readMapStart()
-				assert(nextToken).toBe(JSONToken.mapEnd)
+				assert(nextToken).toBe(JsonToken.mapEnd)
 			}
 		}
 
 
 		@Test
 		fun testConsumesMinimalInput() {
-			assert(reader("n").nextToken).toBe(JSONToken.nullValue)
-			assert(reader("t").nextToken).toBe(JSONToken.booleanValue)
-			assert(reader("f").nextToken).toBe(JSONToken.booleanValue)
-			assert(reader("0").nextToken).toBe(JSONToken.numberValue)
-			assert(reader("1").nextToken).toBe(JSONToken.numberValue)
-			assert(reader("-").nextToken).toBe(JSONToken.numberValue)
-			assert(reader("[").nextToken).toBe(JSONToken.listStart)
-			assert(reader("\"").nextToken).toBe(JSONToken.stringValue)
-			assert(reader("{").nextToken).toBe(JSONToken.mapStart)
+			assert(reader("n").nextToken).toBe(JsonToken.nullValue)
+			assert(reader("t").nextToken).toBe(JsonToken.booleanValue)
+			assert(reader("f").nextToken).toBe(JsonToken.booleanValue)
+			assert(reader("0").nextToken).toBe(JsonToken.numberValue)
+			assert(reader("1").nextToken).toBe(JsonToken.numberValue)
+			assert(reader("-").nextToken).toBe(JsonToken.numberValue)
+			assert(reader("[").nextToken).toBe(JsonToken.listStart)
+			assert(reader("\"").nextToken).toBe(JsonToken.stringValue)
+			assert(reader("{").nextToken).toBe(JsonToken.mapStart)
 		}
 
 
 		@Test
 		fun testIdempotency() {
-			reader("n").apply { nextToken;assert(nextToken).toBe(JSONToken.nullValue) }
-			reader("t").apply { nextToken;assert(nextToken).toBe(JSONToken.booleanValue) }
-			reader("f").apply { nextToken;assert(nextToken).toBe(JSONToken.booleanValue) }
-			reader("0").apply { nextToken;assert(nextToken).toBe(JSONToken.numberValue) }
-			reader("1").apply { nextToken;assert(nextToken).toBe(JSONToken.numberValue) }
-			reader("-").apply { nextToken;assert(nextToken).toBe(JSONToken.numberValue) }
-			reader("[").apply { nextToken;assert(nextToken).toBe(JSONToken.listStart) }
-			reader("\"").apply { nextToken;assert(nextToken).toBe(JSONToken.stringValue) }
-			reader("{").apply { nextToken;assert(nextToken).toBe(JSONToken.mapStart) }
+			reader("n").apply { nextToken;assert(nextToken).toBe(JsonToken.nullValue) }
+			reader("t").apply { nextToken;assert(nextToken).toBe(JsonToken.booleanValue) }
+			reader("f").apply { nextToken;assert(nextToken).toBe(JsonToken.booleanValue) }
+			reader("0").apply { nextToken;assert(nextToken).toBe(JsonToken.numberValue) }
+			reader("1").apply { nextToken;assert(nextToken).toBe(JsonToken.numberValue) }
+			reader("-").apply { nextToken;assert(nextToken).toBe(JsonToken.numberValue) }
+			reader("[").apply { nextToken;assert(nextToken).toBe(JsonToken.listStart) }
+			reader("\"").apply { nextToken;assert(nextToken).toBe(JsonToken.stringValue) }
+			reader("{").apply { nextToken;assert(nextToken).toBe(JsonToken.mapStart) }
 		}
 
 
@@ -972,11 +963,11 @@ internal class StandardReaderAcceptTest {
 	}
 
 
-	private fun reader(reader: Reader): JSONReader =
+	private fun reader(reader: Reader): JsonReader =
 		StandardReader(TextInput(reader))
 
 
-	private fun reader(string: String): JSONReader =
+	private fun reader(string: String): JsonReader =
 		StandardReader(TextInput(StringReader(string)))
 
 
diff --git a/basic/tests/sources/StandardReaderRejectTest.kt b/basic/tests/sources/StandardReaderRejectTest.kt
index 448fb88..ee4364e 100644
--- a/basic/tests/sources/StandardReaderRejectTest.kt
+++ b/basic/tests/sources/StandardReaderRejectTest.kt
@@ -1,6 +1,6 @@
 package tests.basic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
@@ -809,16 +809,16 @@ internal object StandardReaderRejectTest {
 	}
 
 
-	private inline fun readerShouldFail(string: String, block: JSONReader.() -> Unit) {
+	private inline fun readerShouldFail(string: String, block: JsonReader.() -> Unit) {
 		try {
 			StandardReader(TextInput(StringReader(string))).block()
-			throw AssertionError("should fail with a JSONException for JSON: $string")
+			throw AssertionError("should fail with a JsonException for JSON: $string")
 		}
-		catch (e: JSONException) {
+		catch (e: JsonException) {
 			// good
 		}
 		catch (e: Throwable) {
-			throw AssertionError("should fail with a JSONException for JSON: $string", e)
+			throw AssertionError("should fail with a JsonException for JSON: $string", e)
 		}
 	}
 }
diff --git a/basic/tests/sources/StandardWriterAcceptTest.kt b/basic/tests/sources/StandardWriterAcceptTest.kt
index 1a1688c..0a2088a 100644
--- a/basic/tests/sources/StandardWriterAcceptTest.kt
+++ b/basic/tests/sources/StandardWriterAcceptTest.kt
@@ -2,7 +2,7 @@ package tests.basic
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
@@ -949,6 +949,6 @@ internal object StandardWriterAcceptTest {
 	}
 
 
-	private fun write(block: JSONWriter.() -> Unit): String =
-		StringWriter().also { JSONWriter.build(it).block() }.toString()
+	private fun write(block: JsonWriter.() -> Unit): String =
+		StringWriter().also { JsonWriter.build(it).block() }.toString()
 }
diff --git a/basic/tests/sources/StandardWriterRejectTest.kt b/basic/tests/sources/StandardWriterRejectTest.kt
index c8de78b..0ac633f 100644
--- a/basic/tests/sources/StandardWriterRejectTest.kt
+++ b/basic/tests/sources/StandardWriterRejectTest.kt
@@ -1,6 +1,6 @@
 package tests.basic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
@@ -80,12 +80,12 @@ internal object StandardWriterRejectTest {
 	}
 
 
-	private inline fun writerShouldFail(block: JSONWriter.() -> Unit) {
+	private inline fun writerShouldFail(block: JsonWriter.() -> Unit) {
 		try {
 			StandardWriter(StringWriter()).block()
-			throw AssertionError("should fail with a JSONException")
+			throw AssertionError("should fail with a JsonException")
 		}
-		catch (e: JSONException) {
+		catch (e: JsonException) {
 			// good
 		}
 	}
diff --git a/basic/tests/sources/dummys/DummyJSONReader.kt b/basic/tests/sources/dummys/DummyJsonReader.kt
similarity index 66%
rename from basic/tests/sources/dummys/DummyJSONReader.kt
rename to basic/tests/sources/dummys/DummyJsonReader.kt
index 00b24f1..cbb6bbe 100644
--- a/basic/tests/sources/dummys/DummyJSONReader.kt
+++ b/basic/tests/sources/dummys/DummyJsonReader.kt
@@ -1,18 +1,18 @@
 package tests.basic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal open class DummyJSONReader : JSONReader {
+internal open class DummyJsonReader : JsonReader {
 
-	override fun beginValueIsolation() = JSONDepth(0)
+	override fun beginValueIsolation() = JsonDepth(0)
 	override fun close(): Unit = error("")
-	override val depth: JSONDepth get() = error("")
-	override fun endValueIsolation(depth: JSONDepth) {}
+	override val depth: JsonDepth get() = error("")
+	override fun endValueIsolation(depth: JsonDepth) {}
 	override val isInValueIsolation: Boolean get() = false
-	override val nextToken: JSONToken? get() = error("")
+	override val nextToken: JsonToken? get() = error("")
 	override val offset: Int get() = error("")
-	override val path: JSONPath get() = error("")
+	override val path: JsonPath get() = error("")
 	override fun readBoolean(): Boolean = error("")
 	override fun readDouble(): Double = error("")
 	override fun readListEnd(): Unit = error("")
diff --git a/basic/tests/sources/dummys/DummyJSONWriter.kt b/basic/tests/sources/dummys/DummyJsonWriter.kt
similarity index 72%
rename from basic/tests/sources/dummys/DummyJSONWriter.kt
rename to basic/tests/sources/dummys/DummyJsonWriter.kt
index b5ac424..d529c80 100644
--- a/basic/tests/sources/dummys/DummyJSONWriter.kt
+++ b/basic/tests/sources/dummys/DummyJsonWriter.kt
@@ -1,15 +1,15 @@
 package tests.basic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal open class DummyJSONWriter : JSONWriter {
-	override fun beginValueIsolation() = JSONDepth(0)
-	override val depth: JSONDepth get() = error("")
-	override fun endValueIsolation(depth: JSONDepth) {}
+internal open class DummyJsonWriter : JsonWriter {
+	override fun beginValueIsolation() = JsonDepth(0)
+	override val depth: JsonDepth get() = error("")
+	override fun endValueIsolation(depth: JsonDepth) {}
 	override val isInValueIsolation: Boolean get() = error("")
 	override val isErrored: Boolean get() = error("")
-	override val path: JSONPath get() = error("")
+	override val path: JsonPath get() = error("")
 	override fun markAsErrored(): Unit = error("")
 	override fun terminate(): Unit = error("")
 	override fun writeBoolean(value: Boolean): Unit = error("")
diff --git a/build.gradle.kts b/build.gradle.kts
index 2027fc6..3d292a8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,21 +1,15 @@
-import com.github.fluidsonic.fluid.library.*
-import org.gradle.api.tasks.testing.logging.*
+import io.fluidsonic.gradle.*
 
 plugins {
-	id("com.github.fluidsonic.fluid-library") version "0.9.25"
+	id("io.fluidsonic.gradle") version "1.0.1"
 	jacoco
 }
 
-fluidJvmLibrary {
-	name = "fluid-json"
-	version = "0.9.25"
-}
+fluidJvmLibrary(name = "json", version = "1.0.0")
 
 
 subprojects {
 	apply<JacocoPlugin>()
-	apply<JUnitTestSuitePlugin>()
-	apply<TestingBasePlugin>()
 
 	jacoco {
 		toolVersion = "0.8.3"
@@ -24,20 +18,6 @@ subprojects {
 	tasks {
 		val check by this
 
-		withType<Test> {
-			useJUnitPlatform {
-				includeEngines("junit-jupiter")
-			}
-
-			testLogging {
-				events(TestLogEvent.FAILED, TestLogEvent.SKIPPED)
-
-				exceptionFormat = TestExceptionFormat.FULL
-				showExceptions = true
-				testLogging.showStandardStreams = true
-			}
-		}
-
 		withType<JacocoReport> {
 			reports {
 				xml.isEnabled = true
@@ -51,9 +31,5 @@ subprojects {
 	dependencies {
 		testImplementation(kotlin("reflect"))
 		testImplementation("ch.tutteli.atrium:atrium-cc-en_GB-robstoll:0.8.0")
-		testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.2")
-
-		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2")
-		testRuntimeOnly("org.junit.platform:junit-platform-runner:1.5.2")
 	}
 }
diff --git a/buildSrc/sources/configure-kotlinx.kt b/buildSrc/sources/configure-kotlinx.kt
deleted file mode 100644
index e7c815c..0000000
--- a/buildSrc/sources/configure-kotlinx.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-import org.gradle.api.Project
-import org.gradle.api.artifacts.dsl.DependencyHandler
-import org.gradle.kotlin.dsl.*
-
-
-fun DependencyHandler.kotlinx(module: String, version: String) =
-	"org.jetbrains.kotlinx:kotlinx-$module:$version"
-
-
-fun Project.configureKotlinx() {
-	repositories {
-		maven("https://kotlin.bintray.com/kotlinx")
-	}
-}
diff --git a/coding-jdk8/build.gradle.kts b/coding-jdk8/build.gradle.kts
index 63d870b..d52ba41 100644
--- a/coding-jdk8/build.gradle.kts
+++ b/coding-jdk8/build.gradle.kts
@@ -1,8 +1,7 @@
-import com.github.fluidsonic.fluid.library.*
+import io.fluidsonic.gradle.*
 
-fluidJvmLibraryVariant {
+fluidJvmLibraryVariant(JvmTarget.jdk8) {
 	description = "A JSON library written in pure Kotlin (JDK8+ coding extension)"
-	jdk = JvmTarget.jdk8
 }
 
 dependencies {
diff --git a/coding-jdk8/sources/CodingImplementationsJava8.kt b/coding-jdk8/sources/CodingImplementationsJava8.kt
index c13f685..a5a74a3 100644
--- a/coding-jdk8/sources/CodingImplementationsJava8.kt
+++ b/coding-jdk8/sources/CodingImplementationsJava8.kt
@@ -1,8 +1,8 @@
 @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "CANNOT_OVERRIDE_INVISIBLE_MEMBER")
 
-package com.github.fluidsonic.fluid.json.dynamic
+package io.fluidsonic.json.dynamic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 @Suppress("unused")
@@ -10,21 +10,21 @@ internal open class CodingImplementationsJava8 : CodingImplementationsJava7() {
 
 	override fun extendedCodecProviders() =
 		super.extendedCodecProviders() + listOf(
-			DayOfWeekJSONCodec,
-			DurationJSONCodec,
-			InstantJSONCodec,
-			LocalDateJSONCodec,
-			LocalDateTimeJSONCodec,
-			LocalTimeJSONCodec,
-			MonthDayJSONCodec,
-			MonthJSONCodec,
-			OffsetDateTimeJSONCodec,
-			OffsetTimeJSONCodec,
-			PeriodJSONCodec,
-			YearJSONCodec,
-			YearMonthJSONCodec,
-			ZonedDateTimeJSONCodec,
-			ZoneIdJSONCodec,
-			ZoneOffsetJSONCodec
+			DayOfWeekJsonCodec,
+			DurationJsonCodec,
+			InstantJsonCodec,
+			LocalDateJsonCodec,
+			LocalDateTimeJsonCodec,
+			LocalTimeJsonCodec,
+			MonthDayJsonCodec,
+			MonthJsonCodec,
+			OffsetDateTimeJsonCodec,
+			OffsetTimeJsonCodec,
+			PeriodJsonCodec,
+			YearJsonCodec,
+			YearMonthJsonCodec,
+			ZonedDateTimeJsonCodec,
+			ZoneIdJsonCodec,
+			ZoneOffsetJsonCodec
 		)
 }
diff --git a/coding-jdk8/sources/codecs/extended/DayOfWeekJSONCodec.kt b/coding-jdk8/sources/codecs/extended/DayOfWeekJsonCodec.kt
similarity index 74%
rename from coding-jdk8/sources/codecs/extended/DayOfWeekJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/DayOfWeekJsonCodec.kt
index a83bacc..95ba6ca 100644
--- a/coding-jdk8/sources/codecs/extended/DayOfWeekJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/DayOfWeekJsonCodec.kt
@@ -1,12 +1,12 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
 // TODO use Enum codec once implemented
-object DayOfWeekJSONCodec : AbstractJSONCodec<DayOfWeek, JSONCodingContext>() {
+object DayOfWeekJsonCodec : AbstractJsonCodec<DayOfWeek, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<DayOfWeek>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<DayOfWeek>) =
 		readString().let { raw ->
 			when (raw) {
 				"monday" -> DayOfWeek.MONDAY
@@ -21,7 +21,7 @@ object DayOfWeekJSONCodec : AbstractJSONCodec<DayOfWeek, JSONCodingContext>() {
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: DayOfWeek) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: DayOfWeek) =
 		writeString(when (value) {
 			DayOfWeek.MONDAY -> "monday"
 			DayOfWeek.TUESDAY -> "tuesday"
diff --git a/coding-jdk8/sources/codecs/extended/DurationJSONCodec.kt b/coding-jdk8/sources/codecs/extended/DurationJsonCodec.kt
similarity index 50%
rename from coding-jdk8/sources/codecs/extended/DurationJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/DurationJsonCodec.kt
index 9ba2c40..4a7b245 100644
--- a/coding-jdk8/sources/codecs/extended/DurationJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/DurationJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
-object DurationJSONCodec : AbstractJSONCodec<Duration, JSONCodingContext>() {
+object DurationJsonCodec : AbstractJsonCodec<Duration, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Duration>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Duration>) =
 		readString().let { raw ->
 			try {
 				Duration.parse(raw)!!
@@ -16,6 +16,6 @@ object DurationJSONCodec : AbstractJSONCodec<Duration, JSONCodingContext>() {
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Duration) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Duration) =
 		writeString(value.toString())
 }
diff --git a/coding-jdk8/sources/codecs/extended/InstantJSONCodec.kt b/coding-jdk8/sources/codecs/extended/InstantJsonCodec.kt
similarity index 51%
rename from coding-jdk8/sources/codecs/extended/InstantJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/InstantJsonCodec.kt
index 6478fe8..c8b7cd7 100644
--- a/coding-jdk8/sources/codecs/extended/InstantJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/InstantJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
-object InstantJSONCodec : AbstractJSONCodec<Instant, JSONCodingContext>() {
+object InstantJsonCodec : AbstractJsonCodec<Instant, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Instant>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Instant>) =
 		readString().let { raw ->
 			try {
 				Instant.parse(raw)!!
@@ -16,6 +16,6 @@ object InstantJSONCodec : AbstractJSONCodec<Instant, JSONCodingContext>() {
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Instant) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Instant) =
 		writeString(value.toString())
 }
diff --git a/coding-jdk8/sources/codecs/extended/LocalDateJSONCodec.kt b/coding-jdk8/sources/codecs/extended/LocalDateJsonCodec.kt
similarity index 50%
rename from coding-jdk8/sources/codecs/extended/LocalDateJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/LocalDateJsonCodec.kt
index 081cab3..1dd8774 100644
--- a/coding-jdk8/sources/codecs/extended/LocalDateJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/LocalDateJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
-object LocalDateJSONCodec : AbstractJSONCodec<LocalDate, JSONCodingContext>() {
+object LocalDateJsonCodec : AbstractJsonCodec<LocalDate, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<LocalDate>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<LocalDate>) =
 		readString().let { raw ->
 			try {
 				LocalDate.parse(raw)!!
@@ -16,6 +16,6 @@ object LocalDateJSONCodec : AbstractJSONCodec<LocalDate, JSONCodingContext>() {
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: LocalDate) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: LocalDate) =
 		writeString(value.toString())
 }
diff --git a/coding-jdk8/sources/codecs/extended/LocalDateTimeJSONCodec.kt b/coding-jdk8/sources/codecs/extended/LocalDateTimeJSONCodec.kt
deleted file mode 100644
index 5d80b8b..0000000
--- a/coding-jdk8/sources/codecs/extended/LocalDateTimeJSONCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.time.*
-
-
-object LocalDateTimeJSONCodec : AbstractJSONCodec<LocalDateTime, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<LocalDateTime>) =
-		readString().let { raw ->
-			try {
-				LocalDateTime.parse(raw)!!
-			}
-			catch (e: DateTimeException) {
-				invalidValueError("date and time in ISO-8601 format expected, got '$raw'")
-			}
-		}
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: LocalDateTime) =
-		writeString(value.toString())
-}
diff --git a/coding-jdk8/sources/codecs/extended/LocalDateTimeJsonCodec.kt b/coding-jdk8/sources/codecs/extended/LocalDateTimeJsonCodec.kt
new file mode 100644
index 0000000..e79117b
--- /dev/null
+++ b/coding-jdk8/sources/codecs/extended/LocalDateTimeJsonCodec.kt
@@ -0,0 +1,21 @@
+package io.fluidsonic.json
+
+import java.time.*
+
+
+object LocalDateTimeJsonCodec : AbstractJsonCodec<LocalDateTime, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<LocalDateTime>) =
+		readString().let { raw ->
+			try {
+				LocalDateTime.parse(raw)!!
+			}
+			catch (e: DateTimeException) {
+				invalidValueError("date and time in ISO-8601 format expected, got '$raw'")
+			}
+		}
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: LocalDateTime) =
+		writeString(value.toString())
+}
diff --git a/coding-jdk8/sources/codecs/extended/LocalTimeJSONCodec.kt b/coding-jdk8/sources/codecs/extended/LocalTimeJsonCodec.kt
similarity index 50%
rename from coding-jdk8/sources/codecs/extended/LocalTimeJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/LocalTimeJsonCodec.kt
index 19a6a87..6570df3 100644
--- a/coding-jdk8/sources/codecs/extended/LocalTimeJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/LocalTimeJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
-object LocalTimeJSONCodec : AbstractJSONCodec<LocalTime, JSONCodingContext>() {
+object LocalTimeJsonCodec : AbstractJsonCodec<LocalTime, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<LocalTime>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<LocalTime>) =
 		readString().let { raw ->
 			try {
 				LocalTime.parse(raw)!!
@@ -16,6 +16,6 @@ object LocalTimeJSONCodec : AbstractJSONCodec<LocalTime, JSONCodingContext>() {
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: LocalTime) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: LocalTime) =
 		writeString(value.toString())
 }
diff --git a/coding-jdk8/sources/codecs/extended/MonthDayJSONCodec.kt b/coding-jdk8/sources/codecs/extended/MonthDayJsonCodec.kt
similarity index 51%
rename from coding-jdk8/sources/codecs/extended/MonthDayJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/MonthDayJsonCodec.kt
index b6d3419..5b5878a 100644
--- a/coding-jdk8/sources/codecs/extended/MonthDayJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/MonthDayJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
-object MonthDayJSONCodec : AbstractJSONCodec<MonthDay, JSONCodingContext>() {
+object MonthDayJsonCodec : AbstractJsonCodec<MonthDay, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<MonthDay>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<MonthDay>) =
 		readString().let { raw ->
 			try {
 				MonthDay.parse(raw)!!
@@ -16,6 +16,6 @@ object MonthDayJSONCodec : AbstractJSONCodec<MonthDay, JSONCodingContext>() {
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: MonthDay) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: MonthDay) =
 		writeString(value.toString())
 }
diff --git a/coding-jdk8/sources/codecs/extended/MonthJSONCodec.kt b/coding-jdk8/sources/codecs/extended/MonthJsonCodec.kt
similarity index 78%
rename from coding-jdk8/sources/codecs/extended/MonthJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/MonthJsonCodec.kt
index 7f78c8f..d27fb71 100644
--- a/coding-jdk8/sources/codecs/extended/MonthJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/MonthJsonCodec.kt
@@ -1,12 +1,12 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
 // TODO use Enum codec once implemented
-object MonthJSONCodec : AbstractJSONCodec<Month, JSONCodingContext>() {
+object MonthJsonCodec : AbstractJsonCodec<Month, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Month>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Month>) =
 		readString().let { raw ->
 			when (raw) {
 				"january" -> Month.JANUARY
@@ -26,7 +26,7 @@ object MonthJSONCodec : AbstractJSONCodec<Month, JSONCodingContext>() {
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Month) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Month) =
 		writeString(when (value) {
 			Month.JANUARY -> "january"
 			Month.FEBRUARY -> "february"
diff --git a/coding-jdk8/sources/codecs/extended/OffsetDateTimeJSONCodec.kt b/coding-jdk8/sources/codecs/extended/OffsetDateTimeJSONCodec.kt
deleted file mode 100644
index 37fd14b..0000000
--- a/coding-jdk8/sources/codecs/extended/OffsetDateTimeJSONCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.time.*
-
-
-object OffsetDateTimeJSONCodec : AbstractJSONCodec<OffsetDateTime, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<OffsetDateTime>) =
-		readString().let { raw ->
-			try {
-				OffsetDateTime.parse(raw)!!
-			}
-			catch (e: DateTimeException) {
-				invalidValueError("date, time and time zone in ISO-8601 format expected, got '$raw'")
-			}
-		}
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: OffsetDateTime) =
-		writeString(value.toString())
-}
diff --git a/coding-jdk8/sources/codecs/extended/OffsetDateTimeJsonCodec.kt b/coding-jdk8/sources/codecs/extended/OffsetDateTimeJsonCodec.kt
new file mode 100644
index 0000000..c066007
--- /dev/null
+++ b/coding-jdk8/sources/codecs/extended/OffsetDateTimeJsonCodec.kt
@@ -0,0 +1,21 @@
+package io.fluidsonic.json
+
+import java.time.*
+
+
+object OffsetDateTimeJsonCodec : AbstractJsonCodec<OffsetDateTime, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<OffsetDateTime>) =
+		readString().let { raw ->
+			try {
+				OffsetDateTime.parse(raw)!!
+			}
+			catch (e: DateTimeException) {
+				invalidValueError("date, time and time zone in ISO-8601 format expected, got '$raw'")
+			}
+		}
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: OffsetDateTime) =
+		writeString(value.toString())
+}
diff --git a/coding-jdk8/sources/codecs/extended/OffsetTimeJSONCodec.kt b/coding-jdk8/sources/codecs/extended/OffsetTimeJsonCodec.kt
similarity index 51%
rename from coding-jdk8/sources/codecs/extended/OffsetTimeJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/OffsetTimeJsonCodec.kt
index 97ac480..9da2d01 100644
--- a/coding-jdk8/sources/codecs/extended/OffsetTimeJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/OffsetTimeJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
-object OffsetTimeJSONCodec : AbstractJSONCodec<OffsetTime, JSONCodingContext>() {
+object OffsetTimeJsonCodec : AbstractJsonCodec<OffsetTime, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<OffsetTime>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<OffsetTime>) =
 		readString().let { raw ->
 			try {
 				OffsetTime.parse(raw)!!
@@ -16,6 +16,6 @@ object OffsetTimeJSONCodec : AbstractJSONCodec<OffsetTime, JSONCodingContext>()
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: OffsetTime) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: OffsetTime) =
 		writeString(value.toString())
 }
diff --git a/coding-jdk8/sources/codecs/extended/PeriodJSONCodec.kt b/coding-jdk8/sources/codecs/extended/PeriodJSONCodec.kt
deleted file mode 100644
index af05b5b..0000000
--- a/coding-jdk8/sources/codecs/extended/PeriodJSONCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.time.*
-
-
-object PeriodJSONCodec : AbstractJSONCodec<Period, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Period>) =
-		readString().let { raw ->
-			try {
-				Period.parse(raw)!!
-			}
-			catch (e: DateTimeException) {
-				invalidValueError("period in ISO-8601 format expected, got '$raw'")
-			}
-		}
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Period) =
-		writeString(value.toString())
-}
diff --git a/coding-jdk8/sources/codecs/extended/PeriodJsonCodec.kt b/coding-jdk8/sources/codecs/extended/PeriodJsonCodec.kt
new file mode 100644
index 0000000..82563a0
--- /dev/null
+++ b/coding-jdk8/sources/codecs/extended/PeriodJsonCodec.kt
@@ -0,0 +1,21 @@
+package io.fluidsonic.json
+
+import java.time.*
+
+
+object PeriodJsonCodec : AbstractJsonCodec<Period, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Period>) =
+		readString().let { raw ->
+			try {
+				Period.parse(raw)!!
+			}
+			catch (e: DateTimeException) {
+				invalidValueError("period in ISO-8601 format expected, got '$raw'")
+			}
+		}
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Period) =
+		writeString(value.toString())
+}
diff --git a/coding-jdk8/sources/codecs/extended/YearJSONCodec.kt b/coding-jdk8/sources/codecs/extended/YearJSONCodec.kt
deleted file mode 100644
index 6d5331d..0000000
--- a/coding-jdk8/sources/codecs/extended/YearJSONCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.time.*
-
-
-object YearJSONCodec : AbstractJSONCodec<Year, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Year>) =
-		readInt().let { raw ->
-			try {
-				Year.of(raw)!!
-			}
-			catch (e: DateTimeException) {
-				invalidValueError("year in ISO-8601 format expected, got '$raw'")
-			}
-		}
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Year) =
-		writeInt(value.value)
-}
diff --git a/coding-jdk8/sources/codecs/extended/YearJsonCodec.kt b/coding-jdk8/sources/codecs/extended/YearJsonCodec.kt
new file mode 100644
index 0000000..a5dc847
--- /dev/null
+++ b/coding-jdk8/sources/codecs/extended/YearJsonCodec.kt
@@ -0,0 +1,21 @@
+package io.fluidsonic.json
+
+import java.time.*
+
+
+object YearJsonCodec : AbstractJsonCodec<Year, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Year>) =
+		readInt().let { raw ->
+			try {
+				Year.of(raw)!!
+			}
+			catch (e: DateTimeException) {
+				invalidValueError("year in ISO-8601 format expected, got '$raw'")
+			}
+		}
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Year) =
+		writeInt(value.value)
+}
diff --git a/coding-jdk8/sources/codecs/extended/YearMonthJSONCodec.kt b/coding-jdk8/sources/codecs/extended/YearMonthJsonCodec.kt
similarity index 51%
rename from coding-jdk8/sources/codecs/extended/YearMonthJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/YearMonthJsonCodec.kt
index f7ced9b..4044ec9 100644
--- a/coding-jdk8/sources/codecs/extended/YearMonthJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/YearMonthJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
-object YearMonthJSONCodec : AbstractJSONCodec<YearMonth, JSONCodingContext>() {
+object YearMonthJsonCodec : AbstractJsonCodec<YearMonth, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<YearMonth>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<YearMonth>) =
 		readString().let { raw ->
 			try {
 				YearMonth.parse(raw)!!
@@ -16,6 +16,6 @@ object YearMonthJSONCodec : AbstractJSONCodec<YearMonth, JSONCodingContext>() {
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: YearMonth) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: YearMonth) =
 		writeString(value.toString())
 }
diff --git a/coding-jdk8/sources/codecs/extended/ZoneIdJSONCodec.kt b/coding-jdk8/sources/codecs/extended/ZoneIdJSONCodec.kt
deleted file mode 100644
index 8239326..0000000
--- a/coding-jdk8/sources/codecs/extended/ZoneIdJSONCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.time.*
-
-
-object ZoneIdJSONCodec : AbstractJSONCodec<ZoneId, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<ZoneId>) =
-		readString().let { raw ->
-			try {
-				ZoneId.of(raw)!!
-			}
-			catch (e: DateTimeException) {
-				invalidValueError("IANA time zone name expected, got '$raw'")
-			}
-		}
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: ZoneId) =
-		writeString(value.id)
-}
diff --git a/coding-jdk8/sources/codecs/extended/ZoneIdJsonCodec.kt b/coding-jdk8/sources/codecs/extended/ZoneIdJsonCodec.kt
new file mode 100644
index 0000000..91151d8
--- /dev/null
+++ b/coding-jdk8/sources/codecs/extended/ZoneIdJsonCodec.kt
@@ -0,0 +1,21 @@
+package io.fluidsonic.json
+
+import java.time.*
+
+
+object ZoneIdJsonCodec : AbstractJsonCodec<ZoneId, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<ZoneId>) =
+		readString().let { raw ->
+			try {
+				ZoneId.of(raw)!!
+			}
+			catch (e: DateTimeException) {
+				invalidValueError("IANA time zone name expected, got '$raw'")
+			}
+		}
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: ZoneId) =
+		writeString(value.id)
+}
diff --git a/coding-jdk8/sources/codecs/extended/ZoneOffsetJSONCodec.kt b/coding-jdk8/sources/codecs/extended/ZoneOffsetJsonCodec.kt
similarity index 50%
rename from coding-jdk8/sources/codecs/extended/ZoneOffsetJSONCodec.kt
rename to coding-jdk8/sources/codecs/extended/ZoneOffsetJsonCodec.kt
index 54a9c21..82c89ed 100644
--- a/coding-jdk8/sources/codecs/extended/ZoneOffsetJSONCodec.kt
+++ b/coding-jdk8/sources/codecs/extended/ZoneOffsetJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.time.*
 
 
-object ZoneOffsetJSONCodec : AbstractJSONCodec<ZoneOffset, JSONCodingContext>() {
+object ZoneOffsetJsonCodec : AbstractJsonCodec<ZoneOffset, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<ZoneOffset>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<ZoneOffset>) =
 		readString().let { raw ->
 			try {
 				ZoneOffset.of(raw)!!
@@ -16,6 +16,6 @@ object ZoneOffsetJSONCodec : AbstractJSONCodec<ZoneOffset, JSONCodingContext>()
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: ZoneOffset) =
+	override fun JsonEncoder<JsonCodingContext>.encode(value: ZoneOffset) =
 		writeString(value.id)
 }
diff --git a/coding-jdk8/sources/codecs/extended/ZonedDateTimeJSONCodec.kt b/coding-jdk8/sources/codecs/extended/ZonedDateTimeJSONCodec.kt
deleted file mode 100644
index ee20127..0000000
--- a/coding-jdk8/sources/codecs/extended/ZonedDateTimeJSONCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.time.*
-
-
-object ZonedDateTimeJSONCodec : AbstractJSONCodec<ZonedDateTime, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<ZonedDateTime>) =
-		readString().let { raw ->
-			try {
-				ZonedDateTime.parse(raw)!!
-			}
-			catch (e: DateTimeException) {
-				invalidValueError("date, time and time zone in ISO-8601 format expected, got '$raw'")
-			}
-		}
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: ZonedDateTime) =
-		writeString(value.toString())
-}
diff --git a/coding-jdk8/sources/codecs/extended/ZonedDateTimeJsonCodec.kt b/coding-jdk8/sources/codecs/extended/ZonedDateTimeJsonCodec.kt
new file mode 100644
index 0000000..3e8c697
--- /dev/null
+++ b/coding-jdk8/sources/codecs/extended/ZonedDateTimeJsonCodec.kt
@@ -0,0 +1,21 @@
+package io.fluidsonic.json
+
+import java.time.*
+
+
+object ZonedDateTimeJsonCodec : AbstractJsonCodec<ZonedDateTime, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<ZonedDateTime>) =
+		readString().let { raw ->
+			try {
+				ZonedDateTime.parse(raw)!!
+			}
+			catch (e: DateTimeException) {
+				invalidValueError("date, time and time zone in ISO-8601 format expected, got '$raw'")
+			}
+		}
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: ZonedDateTime) =
+		writeString(value.toString())
+}
diff --git a/coding-jdk8/tests/sources/codecs/ExtendedCodecsTest.kt b/coding-jdk8/tests/sources/codecs/ExtendedCodecsTest.kt
index 0d96749..fca1405 100644
--- a/coding-jdk8/tests/sources/codecs/ExtendedCodecsTest.kt
+++ b/coding-jdk8/tests/sources/codecs/ExtendedCodecsTest.kt
@@ -2,7 +2,7 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.time.*
 
@@ -11,30 +11,30 @@ import java.time.*
 internal object ExtendedCodecsTest {
 
 	private val cases = listOf(
-		TestCase("DayOfWeek", DayOfWeekJSONCodec, dayOfWeekData),
-		TestCase("Duration", DurationJSONCodec, durationData),
-		TestCase("Instant", InstantJSONCodec, instantData),
-		TestCase("LocalDate", LocalDateJSONCodec, localDateData),
-		TestCase("LocalDateTime", LocalDateTimeJSONCodec, localDateTimeData),
-		TestCase("LocalTime", LocalTimeJSONCodec, localTimeData),
-		TestCase("Month", MonthJSONCodec, monthData),
-		TestCase("MonthDay", MonthDayJSONCodec, monthDayData),
-		TestCase("OffsetDateTime", OffsetDateTimeJSONCodec, offsetDateTimeData),
-		TestCase("OffsetTime", OffsetTimeJSONCodec, offsetTimeData),
-		TestCase("Period", PeriodJSONCodec, periodData),
-		TestCase("Year", YearJSONCodec, yearData),
-		TestCase("YearMonth", YearMonthJSONCodec, yearMonthData),
-		TestCase("ZonedDateTime", ZonedDateTimeJSONCodec, zonedDateTimeData),
-		TestCase("ZoneId", ZoneIdJSONCodec, zoneIdData),
-		TestCase("ZoneOffset", ZoneOffsetJSONCodec, zoneOffsetData)
+		TestCase("DayOfWeek", DayOfWeekJsonCodec, dayOfWeekData),
+		TestCase("Duration", DurationJsonCodec, durationData),
+		TestCase("Instant", InstantJsonCodec, instantData),
+		TestCase("LocalDate", LocalDateJsonCodec, localDateData),
+		TestCase("LocalDateTime", LocalDateTimeJsonCodec, localDateTimeData),
+		TestCase("LocalTime", LocalTimeJsonCodec, localTimeData),
+		TestCase("Month", MonthJsonCodec, monthData),
+		TestCase("MonthDay", MonthDayJsonCodec, monthDayData),
+		TestCase("OffsetDateTime", OffsetDateTimeJsonCodec, offsetDateTimeData),
+		TestCase("OffsetTime", OffsetTimeJsonCodec, offsetTimeData),
+		TestCase("Period", PeriodJsonCodec, periodData),
+		TestCase("Year", YearJsonCodec, yearData),
+		TestCase("YearMonth", YearMonthJsonCodec, yearMonthData),
+		TestCase("ZonedDateTime", ZonedDateTimeJsonCodec, zonedDateTimeData),
+		TestCase("ZoneId", ZoneIdJsonCodec, zoneIdData),
+		TestCase("ZoneOffset", ZoneOffsetJsonCodec, zoneOffsetData)
 	)
 
 
 	private fun buildTests(case: TestCase<*>) = listOfNotNull(
-		(case.codec as? JSONDecoderCodec<Any, JSONCodingContext>)?.let { decoderCodec ->
+		(case.codec as? JsonDecoderCodec<Any, JsonCodingContext>)?.let { decoderCodec ->
 			DynamicTest.dynamicTest("is decodable") {
 				try {
-					case.data.testDecoding { decoderCodec.parse(it, type = case.type as JSONCodingType<Any>) }
+					case.data.testDecoding { decoderCodec.parse(it, type = case.type as JsonCodingType<Any>) }
 				}
 				catch (e: Throwable) {
 					throw AssertionError("${decoderCodec::class.simpleName} (for ${case.type}): ${e.message}").apply {
@@ -44,7 +44,7 @@ internal object ExtendedCodecsTest {
 			}
 		},
 
-		(case.codec as? JSONEncoderCodec<Any, JSONCodingContext>)?.let { encoderCodec ->
+		(case.codec as? JsonEncoderCodec<Any, JsonCodingContext>)?.let { encoderCodec ->
 			DynamicTest.dynamicTest("is encodable") {
 				try {
 					case.data.testEncoding { encoderCodec.serialize(it) }
@@ -71,7 +71,7 @@ internal object ExtendedCodecsTest {
 
 	@TestFactory
 	fun testDefaultCodecs(): List<DynamicTest> {
-		val provider = JSONCodecProvider(DefaultJSONCodecs.extended)
+		val provider = JsonCodecProvider(DefaultJsonCodecs.extended)
 
 		return listOf(
 			DayOfWeek::class,
@@ -101,8 +101,8 @@ internal object ExtendedCodecsTest {
 
 	private class TestCase<Value : Any> private constructor(
 		val name: String,
-		val codec: JSONCodecProvider<JSONCodingContext>,
-		val type: JSONCodingType<Value>,
+		val codec: JsonCodecProvider<JsonCodingContext>,
+		val type: JsonCodingType<Value>,
 		val data: TestData<Value>
 	) {
 
@@ -110,7 +110,7 @@ internal object ExtendedCodecsTest {
 
 			inline operator fun <reified Value : Any> invoke(
 				name: String,
-				codec: JSONCodecProvider<JSONCodingContext>,
+				codec: JsonCodecProvider<JsonCodingContext>,
 				data: TestData<Value>
 			) =
 				TestCase(name = name, codec = codec, type = jsonCodingType(), data = data)
diff --git a/coding-jdk8/tests/sources/data/TestData.kt b/coding-jdk8/tests/sources/data/TestData.kt
index fe805f3..b30d76f 100644
--- a/coding-jdk8/tests/sources/data/TestData.kt
+++ b/coding-jdk8/tests/sources/data/TestData.kt
@@ -2,7 +2,7 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 internal class TestData<out Value : Any>(
@@ -44,7 +44,7 @@ internal class TestData<out Value : Any>(
 				encode(input)
 				throw AssertionError("Encoding succeeded but should have failed when encoding ${input::class}: $input")
 			}
-			catch (e: JSONException) {
+			catch (e: JsonException) {
 				// good
 			}
 	}
diff --git a/coding-jdk8/tests/sources/utility/Coding.kt b/coding-jdk8/tests/sources/utility/Coding.kt
index fcfa39a..346721c 100644
--- a/coding-jdk8/tests/sources/utility/Coding.kt
+++ b/coding-jdk8/tests/sources/utility/Coding.kt
@@ -1,17 +1,17 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal fun <Value : Any> JSONDecoderCodec<Value, JSONCodingContext>.parse(source: String, type: JSONCodingType<Value>) =
-	JSONCodingParser.builder()
+internal fun <Value : Any> JsonDecoderCodec<Value, JsonCodingContext>.parse(source: String, type: JsonCodingType<Value>) =
+	JsonCodingParser.builder()
 		.decodingWith(this, base = null)
 		.build()
 		.parseValueOfType(source, type)
 
 
-internal fun <Value : Any> JSONEncoderCodec<Value, JSONCodingContext>.serialize(value: Value) =
-	JSONCodingSerializer.builder()
+internal fun <Value : Any> JsonEncoderCodec<Value, JsonCodingContext>.serialize(value: Value) =
+	JsonCodingSerializer.builder()
 		.encodingWith(this, base = null)
 		.build()
 		.serializeValue(value)
diff --git a/coding/build.gradle.kts b/coding/build.gradle.kts
index d2497e4..4a60658 100644
--- a/coding/build.gradle.kts
+++ b/coding/build.gradle.kts
@@ -1,6 +1,6 @@
-import com.github.fluidsonic.fluid.library.*
+import io.fluidsonic.gradle.*
 
-fluidJvmLibraryVariant {
+fluidJvmLibraryVariant(JvmTarget.jdk7) {
 	description = "A JSON library written in pure Kotlin (coding extension)"
 }
 
diff --git a/coding/sources/CodingImplementationsJava.kt b/coding/sources/CodingImplementationsJava.kt
index b60020e..eb21b88 100644
--- a/coding/sources/CodingImplementationsJava.kt
+++ b/coding/sources/CodingImplementationsJava.kt
@@ -1,18 +1,18 @@
-package com.github.fluidsonic.fluid.json.dynamic
+package io.fluidsonic.json.dynamic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 internal interface CodingImplementationsJava {
 
-	fun extendedCodecProviders(): List<JSONCodecProvider<JSONCodingContext>> =
+	fun extendedCodecProviders(): List<JsonCodecProvider<JsonCodingContext>> =
 		emptyList()
 }
 
 
 internal val codingImplementationsJava: CodingImplementationsJava by lazy {
 	try {
-		return@lazy Class.forName("com.github.fluidsonic.fluid.json.dynamic.CodingImplementationsJava8").getDeclaredConstructor().newInstance()
+		return@lazy Class.forName("io.fluidsonic.json.dynamic.CodingImplementationsJava8").getDeclaredConstructor().newInstance()
 			as CodingImplementationsJava
 	}
 	catch (e: Exception) {
diff --git a/coding/sources/CodingImplementationsJava7.kt b/coding/sources/CodingImplementationsJava7.kt
index 3fe3d70..447f8cc 100644
--- a/coding/sources/CodingImplementationsJava7.kt
+++ b/coding/sources/CodingImplementationsJava7.kt
@@ -1,6 +1,6 @@
-package com.github.fluidsonic.fluid.json.dynamic
+package io.fluidsonic.json.dynamic
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 internal open class CodingImplementationsJava7 : CodingImplementationsJava {
@@ -8,12 +8,12 @@ internal open class CodingImplementationsJava7 : CodingImplementationsJava {
 	override fun extendedCodecProviders() =
 		super.extendedCodecProviders() + listOf(
 			// from specific to unspecific
-			CharRangeJSONCodec,
-			IntRangeJSONCodec,
-			LongRangeJSONCodec,
-			ClosedRangeJSONCodec,
-			EnumJSONCodecProvider(
-				transformation = EnumJSONTransformation.ToString(case = EnumJSONTransformation.Case.lowerCamelCase)
+			CharRangeJsonCodec,
+			IntRangeJsonCodec,
+			LongRangeJsonCodec,
+			ClosedRangeJsonCodec,
+			EnumJsonCodecProvider(
+				transformation = EnumJsonTransformation.ToString(case = EnumJsonTransformation.Case.lowerCamelCase)
 			)
 		)
 }
diff --git a/coding/sources/JSONCodec.kt b/coding/sources/JSONCodec.kt
deleted file mode 100644
index 9e60d11..0000000
--- a/coding/sources/JSONCodec.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import kotlin.reflect.*
-
-
-interface JSONCodec<Value : Any, in Context : JSONCodingContext>
-	: JSONDecoderCodec<Value, Context>, JSONEncoderCodec<Value, Context> {
-
-	override val decodableType: JSONCodingType<Value>
-
-
-	override val encodableClass: KClass<Value>
-		get() = decodableType.rawClass
-
-
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>) =
-		super<JSONDecoderCodec>.decoderCodecForType(decodableType)
-
-
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>) =
-		super<JSONEncoderCodec>.encoderCodecForClass(encodableClass)
-
-
-	companion object
-}
diff --git a/coding/sources/JSONCodecProvider.kt b/coding/sources/JSONCodecProvider.kt
deleted file mode 100644
index 08c8500..0000000
--- a/coding/sources/JSONCodecProvider.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import kotlin.reflect.*
-
-
-interface JSONCodecProvider<in Context : JSONCodingContext> {
-
-	fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>): JSONDecoderCodec<ActualValue, Context>?
-	fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JSONEncoderCodec<ActualValue, Context>?
-
-
-	companion object {
-
-		@Deprecated(message = "replaced by JSONCodecProvider(…), but be careful because that one no longer adds base providers automatically")
-		@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
-		fun <Context : JSONCodingContext> of(
-			vararg providers: JSONCodecProvider<Context>,
-			base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-		) =
-			of(providers.asIterable(), base = base)
-
-
-		@Deprecated(message = "replaced by JSONCodecProvider(…), but be careful because that one no longer adds base providers automatically")
-		@Suppress("DeprecatedCallableAddReplaceWith")
-		fun <Context : JSONCodingContext> of(
-			providers: Iterable<JSONCodecProvider<Context>>,
-			base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-		): JSONCodecProvider<Context> =
-			FixedCodecProvider(providers = base?.let { providers + it } ?: providers)
-
-	}
-}
-
-
-private val basicProvider = JSONCodecProvider(DefaultJSONCodecs.basic + DefaultJSONCodecs.nonRecursive)
-private val extendedProvider = JSONCodecProvider(DefaultJSONCodecs.extended + DefaultJSONCodecs.basic + DefaultJSONCodecs.nonRecursive)
-
-
-val JSONCodecProvider.Companion.basic
-	get() = basicProvider
-
-
-inline fun <reified ActualValue : Any, Context : JSONCodingContext> JSONCodecProvider<Context>.decoderCodecForType() =
-	decoderCodecForType(jsonCodingType<ActualValue>())
-
-
-inline fun <reified ActualValue : Any, Context : JSONCodingContext> JSONCodecProvider<Context>.encoderCodecForClass() =
-	encoderCodecForClass(ActualValue::class)
-
-
-val JSONCodecProvider.Companion.extended
-	get() = extendedProvider
-
-
-fun <CodecProvider : JSONCodecProvider<*>> JSONCodecProvider.Companion.generated(interfaceClass: KClass<CodecProvider>): CodecProvider =
-	error("Cannot find annotation-based codec provider. Either $interfaceClass hasn't been annotated with @JSON.CodecProvider or kapt hasn't been run.")
diff --git a/coding/sources/JSONCodingContext.kt b/coding/sources/JSONCodingContext.kt
deleted file mode 100644
index d5698c6..0000000
--- a/coding/sources/JSONCodingContext.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-interface JSONCodingContext {
-
-	companion object {
-
-		val empty = object : JSONCodingContext {}
-	}
-}
diff --git a/coding/sources/JSONCodingParser.kt b/coding/sources/JSONCodingParser.kt
deleted file mode 100644
index 75b0fed..0000000
--- a/coding/sources/JSONCodingParser.kt
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.io.*
-
-
-interface JSONCodingParser<out Context : JSONCodingContext> : JSONParser {
-
-	fun createDecoder(source: JSONReader): JSONDecoder<Context>
-
-
-	override fun parseList(source: JSONReader, withTermination: Boolean) =
-		parseValueOfType<List<*>>(source, withTermination = withTermination)
-
-
-	override fun parseMap(source: JSONReader, withTermination: Boolean) =
-		parseValueOfType<Map<String, *>>(source, withTermination = withTermination)
-
-
-	fun <Value : Any> parseValueOfType(source: JSONReader, valueType: JSONCodingType<Value>, withTermination: Boolean = true) =
-		createDecoder(source).withTermination(withTermination) { readValueOfType(valueType) }
-
-
-	fun <Value : Any> parseValueOfTypeOrNull(source: JSONReader, valueType: JSONCodingType<Value>, withTermination: Boolean = true) =
-		createDecoder(source).withTermination(withTermination) { readValueOfTypeOrNull(valueType) }
-
-
-	override fun parseValueOrNull(source: JSONReader, withTermination: Boolean) =
-		parseValueOfTypeOrNull<Any>(source, withTermination = withTermination)
-
-
-	companion object {
-
-		fun builder(): BuilderForDecoding<JSONCodingContext> =
-			BuilderForDecodingImpl(context = JSONCodingContext.empty)
-
-
-		fun <Context : JSONCodingContext> builder(context: Context): BuilderForDecoding<Context> =
-			BuilderForDecodingImpl(context = context)
-
-
-		val default = builder()
-			.decodingWith()
-			.build()
-
-
-		val nonRecursive = builder()
-			.decodingWith(DefaultJSONCodecs.nonRecursive)
-			.build()
-
-
-		interface BuilderForDecoding<Context : JSONCodingContext> {
-
-			fun decodingWith(factory: (source: JSONReader, context: Context) -> JSONDecoder<Context>): Builder<Context>
-
-
-			fun decodingWith(
-				vararg providers: JSONCodecProvider<Context>,
-				base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-			) =
-				decodingWith(providers = providers.toList(), base = base)
-
-
-			fun decodingWith(
-				providers: Iterable<JSONCodecProvider<Context>>,
-				base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-			) =
-				decodingWith { source, context ->
-					JSONDecoder.builder(context)
-						.codecs(JSONCodecProvider(providers), base = base)
-						.source(source)
-						.build()
-				}
-		}
-
-
-		private class BuilderForDecodingImpl<Context : JSONCodingContext>(
-			private val context: Context
-		) : BuilderForDecoding<Context> {
-
-			override fun decodingWith(factory: (source: JSONReader, context: Context) -> JSONDecoder<Context>) =
-				BuilderImpl(
-					context = context,
-					decoderFactory = factory
-				)
-		}
-
-
-		interface Builder<out Context : JSONCodingContext> {
-
-			fun build(): JSONCodingParser<Context>
-		}
-
-
-		private class BuilderImpl<out Context : JSONCodingContext>(
-			private val context: Context,
-			private val decoderFactory: (source: JSONReader, context: Context) -> JSONDecoder<Context>
-		) : Builder<Context> {
-
-			override fun build() =
-				StandardCodingParser(
-					context = context,
-					decoderFactory = decoderFactory
-				)
-		}
-	}
-}
-
-
-fun JSONCodingParser<*>.parseValue(source: JSONReader, withTermination: Boolean = true) =
-	parseValueOrNull(source, withTermination = withTermination)
-		?: throw JSONException.Schema(
-			message = "Unexpected null value at top-level",
-			offset = source.offset,
-			path = source.path
-		)
-
-
-fun JSONCodingParser<*>.parseValue(source: Reader, withTermination: Boolean = true) =
-	parseValue(JSONReader.build(source), withTermination = withTermination)
-
-
-fun JSONCodingParser<*>.parseValue(source: String) =
-	parseValue(JSONReader.build(source))
-
-
-inline fun <reified Value : Any> JSONCodingParser<*>.parseValueOfType(source: JSONReader, withTermination: Boolean = true): Value =
-	parseValueOfType(source, valueType = jsonCodingType(), withTermination = withTermination)
-
-
-inline fun <reified Value : Any> JSONCodingParser<*>.parseValueOfType(source: Reader, withTermination: Boolean = true): Value =
-	parseValueOfType(JSONReader.build(source), withTermination = withTermination)
-
-
-inline fun <reified Value : Any> JSONCodingParser<*>.parseValueOfType(source: String): Value =
-	parseValueOfType(JSONReader.build(source))
-
-
-fun <Value : Any> JSONCodingParser<*>.parseValueOfType(source: Reader, valueType: JSONCodingType<Value>, withTermination: Boolean = true) =
-	parseValueOfType(JSONReader.build(source), valueType = valueType, withTermination = withTermination)
-
-
-fun <Value : Any> JSONCodingParser<*>.parseValueOfType(source: String, valueType: JSONCodingType<Value>): Value =
-	parseValueOfType(JSONReader.build(source), valueType = valueType)
-
-
-inline fun <reified Value : Any> JSONCodingParser<*>.parseValueOfTypeOrNull(source: JSONReader, withTermination: Boolean = true): Value? =
-	parseValueOfTypeOrNull(source, valueType = jsonCodingType(), withTermination = withTermination)
-
-
-inline fun <reified Value : Any> JSONCodingParser<*>.parseValueOfTypeOrNull(source: Reader, withTermination: Boolean = true): Value? =
-	parseValueOfTypeOrNull(JSONReader.build(source), withTermination = withTermination)
-
-
-inline fun <reified Value : Any> JSONCodingParser<*>.parseValueOfTypeOrNull(source: String): Value? =
-	parseValueOfTypeOrNull(JSONReader.build(source))
-
-
-fun <Value : Any> JSONCodingParser<*>.parseValueOfTypeOrNull(source: Reader, valueType: JSONCodingType<Value>, withTermination: Boolean = true): Value? =
-	parseValueOfTypeOrNull(JSONReader.build(source), valueType = valueType, withTermination = withTermination)
-
-
-fun <Value : Any> JSONCodingParser<*>.parseValueOfTypeOrNull(source: String, valueType: JSONCodingType<Value>): Value? =
-	parseValueOfTypeOrNull(JSONReader.build(source), valueType = valueType)
-
-
-fun JSONCodingParser<*>.parseValueOrNull(source: Reader, withTermination: Boolean = true) =
-	parseValueOrNull(JSONReader.build(source), withTermination = withTermination)
-
-
-fun JSONCodingParser<*>.parseValueOrNull(source: String) =
-	parseValueOrNull(JSONReader.build(source))
diff --git a/coding/sources/JSONCodingSerializer.kt b/coding/sources/JSONCodingSerializer.kt
deleted file mode 100644
index c197e1b..0000000
--- a/coding/sources/JSONCodingSerializer.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-interface JSONCodingSerializer : JSONSerializer {
-
-	override fun serializeValue(value: Any?, destination: JSONWriter, withTermination: Boolean)
-
-
-	companion object {
-
-		fun builder(): BuilderForEncoding<JSONCodingContext> =
-			BuilderForEncodingImpl(context = JSONCodingContext.empty)
-
-
-		fun <Context : JSONCodingContext> builder(context: Context): BuilderForEncoding<Context> =
-			BuilderForEncodingImpl(context = context)
-
-
-		val default = builder()
-			.encodingWith()
-			.build()
-
-
-		val nonRecursive = builder()
-			.encodingWith(DefaultJSONCodecs.nonRecursive)
-			.build()
-
-
-		interface BuilderForEncoding<Context : JSONCodingContext> {
-
-			fun encodingWith(factory: (destination: JSONWriter, context: Context) -> JSONEncoder<Context>): Builder
-
-
-			fun encodingWith(
-				vararg providers: JSONCodecProvider<Context>,
-				base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-			) =
-				encodingWith(providers = providers.toList(), base = base)
-
-
-			fun encodingWith(
-				providers: Iterable<JSONCodecProvider<Context>>,
-				base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-			) =
-				encodingWith { destination, context ->
-					JSONEncoder.builder(context)
-						.codecs(JSONCodecProvider(providers), base = base)
-						.destination(destination)
-						.build()
-				}
-		}
-
-
-		private class BuilderForEncodingImpl<Context : JSONCodingContext>(
-			private val context: Context
-		) : BuilderForEncoding<Context> {
-
-			override fun encodingWith(factory: (source: JSONWriter, context: Context) -> JSONEncoder<Context>) =
-				BuilderImpl(
-					context = context,
-					encoderFactory = factory
-				)
-		}
-
-
-		interface Builder {
-
-			fun build(): JSONCodingSerializer
-		}
-
-
-		private class BuilderImpl<out Context : JSONCodingContext>(
-			private val context: Context,
-			private val encoderFactory: (source: JSONWriter, context: Context) -> JSONEncoder<Context>
-		) : Builder {
-
-			override fun build() =
-				StandardCodingSerializer(
-					context = context,
-					encoderFactory = encoderFactory
-				)
-		}
-	}
-}
diff --git a/coding/sources/JSONDecoder.kt b/coding/sources/JSONDecoder.kt
deleted file mode 100644
index 84fd530..0000000
--- a/coding/sources/JSONDecoder.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.io.*
-
-
-interface JSONDecoder<out Context : JSONCodingContext> : JSONReader {
-
-	val context: Context
-
-
-	override fun readValue() =
-		readValueOfType<Any>()
-
-
-	fun <Value : Any> readValueOfType(valueType: JSONCodingType<Value>): Value
-
-
-	companion object {
-
-		fun builder(): BuilderForCodecs<JSONCodingContext> =
-			BuilderForCodecsImpl(context = JSONCodingContext.empty)
-
-
-		fun <Context : JSONCodingContext> builder(context: Context): BuilderForCodecs<Context> =
-			BuilderForCodecsImpl(context = context)
-
-
-		interface BuilderForCodecs<out Context : JSONCodingContext> {
-
-			fun codecs(
-				vararg providers: JSONCodecProvider<Context>,
-				base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-			) =
-				codecs(providers = providers.toList(), base = base)
-
-
-			fun codecs(
-				providers: Iterable<JSONCodecProvider<Context>>,
-				base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-			): BuilderForSource<Context>
-		}
-
-
-		private class BuilderForCodecsImpl<out Context : JSONCodingContext>(
-			private val context: Context
-		) : BuilderForCodecs<Context> {
-
-			override fun codecs(
-				providers: Iterable<JSONCodecProvider<Context>>,
-				base: JSONCodecProvider<JSONCodingContext>?
-			) =
-				BuilderForSourceImpl(
-					context = context,
-					codecProvider = JSONCodecProvider(base?.let { providers + it } ?: providers)
-				)
-		}
-
-
-		interface BuilderForSource<out Context : JSONCodingContext> {
-
-			fun source(source: JSONReader): Builder<Context>
-
-
-			fun source(source: Reader) =
-				source(JSONReader.build(source))
-
-
-			fun source(source: String) =
-				source(StringReader(source))
-		}
-
-
-		private class BuilderForSourceImpl<out Context : JSONCodingContext>(
-			private val context: Context,
-			private val codecProvider: JSONCodecProvider<Context>
-		) : BuilderForSource<Context> {
-
-			override fun source(source: JSONReader) =
-				BuilderImpl(
-					context = context,
-					codecProvider = codecProvider,
-					source = source
-				)
-		}
-
-
-		interface Builder<out Context : JSONCodingContext> {
-
-			fun build(): JSONDecoder<Context>
-		}
-
-
-		private class BuilderImpl<out Context : JSONCodingContext>(
-			private val context: Context,
-			private val codecProvider: JSONCodecProvider<Context>,
-			private val source: JSONReader
-		) : Builder<Context> {
-
-			override fun build() =
-				StandardDecoder(
-					context = context,
-					codecProvider = codecProvider,
-					source = source
-				)
-		}
-	}
-}
-
-
-fun JSONDecoder<*>.invalidPropertyError(property: String, details: String): Nothing =
-	schemaError("Invalid value for property '$property': $details")
-
-
-fun JSONDecoder<*>.invalidValueError(details: String): Nothing =
-	schemaError("Invalid value: $details")
-
-
-fun JSONDecoder<*>.missingPropertyError(property: String): Nothing =
-	schemaError("Missing value for property '$property'")
-
-
-fun JSONDecoder<*>.parsingError(message: String): Nothing =
-	throw JSONException.Parsing(
-		message = message,
-		offset = offset,
-		path = path
-	)
-
-
-fun JSONDecoder<*>.readValueOrNull() =
-	if (nextToken != JSONToken.nullValue) readValue() else readNull()
-
-
-inline fun <reified Value : Any> JSONDecoder<*>.readValueOfType() =
-	readValueOfType(jsonCodingType<Value>())
-
-
-inline fun <reified Value : Any> JSONDecoder<*>.readValueOfTypeOrNull() =
-	readValueOfTypeOrNull(jsonCodingType<Value>())
-
-
-fun <Value : Any> JSONDecoder<*>.readValueOfTypeOrNull(valueType: JSONCodingType<Value>) =
-	readOrNull { readValueOfType(valueType) }
-
-
-fun JSONDecoder<*>.schemaError(message: String): Nothing =
-	throw JSONException.Schema(
-		message = message,
-		offset = offset,
-		path = path
-	)
diff --git a/coding/sources/JSONEncoder.kt b/coding/sources/JSONEncoder.kt
deleted file mode 100644
index 3bacca7..0000000
--- a/coding/sources/JSONEncoder.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import java.io.*
-
-
-interface JSONEncoder<out Context : JSONCodingContext> : JSONWriter {
-
-	val context: Context
-
-
-	companion object {
-
-		fun builder(): BuilderForCodecs<JSONCodingContext> =
-			BuilderForCodecsImpl(context = JSONCodingContext.empty)
-
-
-		fun <Context : JSONCodingContext> builder(context: Context): BuilderForCodecs<Context> =
-			BuilderForCodecsImpl(context = context)
-
-
-		interface BuilderForCodecs<out Context : JSONCodingContext> {
-
-			fun codecs(
-				vararg providers: JSONCodecProvider<Context>,
-				base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-			) =
-				codecs(providers = providers.toList(), base = base)
-
-
-			fun codecs(
-				providers: Iterable<JSONCodecProvider<Context>>,
-				base: JSONCodecProvider<JSONCodingContext>? = JSONCodecProvider.extended
-			): BuilderForDestination<Context>
-		}
-
-
-		private class BuilderForCodecsImpl<out Context : JSONCodingContext>(
-			private val context: Context
-		) : BuilderForCodecs<Context> {
-
-			override fun codecs(
-				providers: Iterable<JSONCodecProvider<Context>>,
-				base: JSONCodecProvider<JSONCodingContext>?
-			) =
-				BuilderForDestinationImpl(
-					context = context,
-					codecProvider = JSONCodecProvider(base?.let { providers + it } ?: providers)
-				)
-		}
-
-
-		interface BuilderForDestination<out Context : JSONCodingContext> {
-
-			fun destination(destination: JSONWriter): Builder<Context>
-
-
-			fun destination(destination: Writer) =
-				destination(JSONWriter.build(destination))
-		}
-
-
-		private class BuilderForDestinationImpl<out Context : JSONCodingContext>(
-			private val context: Context,
-			private val codecProvider: JSONCodecProvider<Context>
-		) : BuilderForDestination<Context> {
-
-			override fun destination(destination: JSONWriter) =
-				BuilderImpl(
-					context = context,
-					codecProvider = codecProvider,
-					destination = destination
-				)
-		}
-
-
-		interface Builder<out Context : JSONCodingContext> {
-
-			fun build(): JSONEncoder<Context>
-		}
-
-
-		private class BuilderImpl<out Context : JSONCodingContext>(
-			private val context: Context,
-			private val codecProvider: JSONCodecProvider<Context>,
-			private val destination: JSONWriter
-		) : Builder<Context> {
-
-			override fun build() =
-				StandardEncoder(
-					context = context,
-					codecProvider = codecProvider,
-					destination = destination
-				)
-		}
-	}
-}
-
-
-fun JSONEncoder<*>.serializationError(message: String): Nothing =
-	throw JSONException.Serialization(
-		message = message,
-		path = path
-	)
diff --git a/coding/sources/JSONEncoderCodec.kt b/coding/sources/JSONEncoderCodec.kt
deleted file mode 100644
index 41b0f6c..0000000
--- a/coding/sources/JSONEncoderCodec.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import kotlin.reflect.*
-
-
-interface JSONEncoderCodec<in Value : Any, in Context : JSONCodingContext> : JSONCodecProvider<Context> {
-
-	val encodableClass: KClass<in Value>
-
-
-	fun JSONEncoder<Context>.encode(value: Value)
-
-
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>): JSONDecoderCodec<ActualValue, Context>? =
-		null
-
-
-	@Suppress("UNCHECKED_CAST")
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JSONEncoderCodec<ActualValue, Context>? =
-		if (encodableClass.isAssignableOrBoxableTo(this.encodableClass))
-			this as JSONEncoderCodec<ActualValue, Context>
-		else
-			null
-
-
-	companion object
-}
diff --git a/coding/sources/JsonCodec.kt b/coding/sources/JsonCodec.kt
new file mode 100644
index 0000000..7a163b6
--- /dev/null
+++ b/coding/sources/JsonCodec.kt
@@ -0,0 +1,25 @@
+package io.fluidsonic.json
+
+import kotlin.reflect.*
+
+
+interface JsonCodec<Value : Any, in Context : JsonCodingContext>
+	: JsonDecoderCodec<Value, Context>, JsonEncoderCodec<Value, Context> {
+
+	override val decodableType: JsonCodingType<Value>
+
+
+	override val encodableClass: KClass<Value>
+		get() = decodableType.rawClass
+
+
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>) =
+		super<JsonDecoderCodec>.decoderCodecForType(decodableType)
+
+
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>) =
+		super<JsonEncoderCodec>.encoderCodecForClass(encodableClass)
+
+
+	companion object
+}
diff --git a/coding/sources/JsonCodecProvider.kt b/coding/sources/JsonCodecProvider.kt
new file mode 100644
index 0000000..ec62e7c
--- /dev/null
+++ b/coding/sources/JsonCodecProvider.kt
@@ -0,0 +1,56 @@
+package io.fluidsonic.json
+
+import kotlin.reflect.*
+
+
+interface JsonCodecProvider<in Context : JsonCodingContext> {
+
+	fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>): JsonDecoderCodec<ActualValue, Context>?
+	fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JsonEncoderCodec<ActualValue, Context>?
+
+
+	companion object {
+
+		@Deprecated(message = "replaced by JsonCodecProvider(…), but be careful because that one no longer adds base providers automatically")
+		@Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith")
+		fun <Context : JsonCodingContext> of(
+			vararg providers: JsonCodecProvider<Context>,
+			base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+		) =
+			of(providers.asIterable(), base = base)
+
+
+		@Deprecated(message = "replaced by JsonCodecProvider(…), but be careful because that one no longer adds base providers automatically")
+		@Suppress("DeprecatedCallableAddReplaceWith")
+		fun <Context : JsonCodingContext> of(
+			providers: Iterable<JsonCodecProvider<Context>>,
+			base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+		): JsonCodecProvider<Context> =
+			FixedCodecProvider(providers = base?.let { providers + it } ?: providers)
+
+	}
+}
+
+
+private val basicProvider = JsonCodecProvider(DefaultJsonCodecs.basic + DefaultJsonCodecs.nonRecursive)
+private val extendedProvider = JsonCodecProvider(DefaultJsonCodecs.extended + DefaultJsonCodecs.basic + DefaultJsonCodecs.nonRecursive)
+
+
+val JsonCodecProvider.Companion.basic
+	get() = basicProvider
+
+
+inline fun <reified ActualValue : Any, Context : JsonCodingContext> JsonCodecProvider<Context>.decoderCodecForType() =
+	decoderCodecForType(jsonCodingType<ActualValue>())
+
+
+inline fun <reified ActualValue : Any, Context : JsonCodingContext> JsonCodecProvider<Context>.encoderCodecForClass() =
+	encoderCodecForClass(ActualValue::class)
+
+
+val JsonCodecProvider.Companion.extended
+	get() = extendedProvider
+
+
+fun <CodecProvider : JsonCodecProvider<*>> JsonCodecProvider.Companion.generated(interfaceClass: KClass<CodecProvider>): CodecProvider =
+	error("Cannot find annotation-based codec provider. Either $interfaceClass hasn't been annotated with @Json.CodecProvider or kapt hasn't been run.")
diff --git a/coding/sources/JsonCodingContext.kt b/coding/sources/JsonCodingContext.kt
new file mode 100644
index 0000000..76c24d2
--- /dev/null
+++ b/coding/sources/JsonCodingContext.kt
@@ -0,0 +1,10 @@
+package io.fluidsonic.json
+
+
+interface JsonCodingContext {
+
+	companion object {
+
+		val empty = object : JsonCodingContext {}
+	}
+}
diff --git a/coding/sources/JsonCodingParser.kt b/coding/sources/JsonCodingParser.kt
new file mode 100644
index 0000000..4a6608a
--- /dev/null
+++ b/coding/sources/JsonCodingParser.kt
@@ -0,0 +1,171 @@
+package io.fluidsonic.json
+
+import java.io.*
+
+
+interface JsonCodingParser<out Context : JsonCodingContext> : JsonParser {
+
+	fun createDecoder(source: JsonReader): JsonDecoder<Context>
+
+
+	override fun parseList(source: JsonReader, withTermination: Boolean) =
+		parseValueOfType<List<*>>(source, withTermination = withTermination)
+
+
+	override fun parseMap(source: JsonReader, withTermination: Boolean) =
+		parseValueOfType<Map<String, *>>(source, withTermination = withTermination)
+
+
+	fun <Value : Any> parseValueOfType(source: JsonReader, valueType: JsonCodingType<Value>, withTermination: Boolean = true) =
+		createDecoder(source).withTermination(withTermination) { readValueOfType(valueType) }
+
+
+	fun <Value : Any> parseValueOfTypeOrNull(source: JsonReader, valueType: JsonCodingType<Value>, withTermination: Boolean = true) =
+		createDecoder(source).withTermination(withTermination) { readValueOfTypeOrNull(valueType) }
+
+
+	override fun parseValueOrNull(source: JsonReader, withTermination: Boolean) =
+		parseValueOfTypeOrNull<Any>(source, withTermination = withTermination)
+
+
+	companion object {
+
+		fun builder(): BuilderForDecoding<JsonCodingContext> =
+			BuilderForDecodingImpl(context = JsonCodingContext.empty)
+
+
+		fun <Context : JsonCodingContext> builder(context: Context): BuilderForDecoding<Context> =
+			BuilderForDecodingImpl(context = context)
+
+
+		val default = builder()
+			.decodingWith()
+			.build()
+
+
+		val nonRecursive = builder()
+			.decodingWith(DefaultJsonCodecs.nonRecursive)
+			.build()
+
+
+		interface BuilderForDecoding<Context : JsonCodingContext> {
+
+			fun decodingWith(factory: (source: JsonReader, context: Context) -> JsonDecoder<Context>): Builder<Context>
+
+
+			fun decodingWith(
+				vararg providers: JsonCodecProvider<Context>,
+				base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+			) =
+				decodingWith(providers = providers.toList(), base = base)
+
+
+			fun decodingWith(
+				providers: Iterable<JsonCodecProvider<Context>>,
+				base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+			) =
+				decodingWith { source, context ->
+					JsonDecoder.builder(context)
+						.codecs(JsonCodecProvider(providers), base = base)
+						.source(source)
+						.build()
+				}
+		}
+
+
+		private class BuilderForDecodingImpl<Context : JsonCodingContext>(
+			private val context: Context
+		) : BuilderForDecoding<Context> {
+
+			override fun decodingWith(factory: (source: JsonReader, context: Context) -> JsonDecoder<Context>) =
+				BuilderImpl(
+					context = context,
+					decoderFactory = factory
+				)
+		}
+
+
+		interface Builder<out Context : JsonCodingContext> {
+
+			fun build(): JsonCodingParser<Context>
+		}
+
+
+		private class BuilderImpl<out Context : JsonCodingContext>(
+			private val context: Context,
+			private val decoderFactory: (source: JsonReader, context: Context) -> JsonDecoder<Context>
+		) : Builder<Context> {
+
+			override fun build() =
+				StandardCodingParser(
+					context = context,
+					decoderFactory = decoderFactory
+				)
+		}
+	}
+}
+
+
+fun JsonCodingParser<*>.parseValue(source: JsonReader, withTermination: Boolean = true) =
+	parseValueOrNull(source, withTermination = withTermination)
+		?: throw JsonException.Schema(
+			message = "Unexpected null value at top-level",
+			offset = source.offset,
+			path = source.path
+		)
+
+
+fun JsonCodingParser<*>.parseValue(source: Reader, withTermination: Boolean = true) =
+	parseValue(JsonReader.build(source), withTermination = withTermination)
+
+
+fun JsonCodingParser<*>.parseValue(source: String) =
+	parseValue(JsonReader.build(source))
+
+
+inline fun <reified Value : Any> JsonCodingParser<*>.parseValueOfType(source: JsonReader, withTermination: Boolean = true): Value =
+	parseValueOfType(source, valueType = jsonCodingType(), withTermination = withTermination)
+
+
+inline fun <reified Value : Any> JsonCodingParser<*>.parseValueOfType(source: Reader, withTermination: Boolean = true): Value =
+	parseValueOfType(JsonReader.build(source), withTermination = withTermination)
+
+
+inline fun <reified Value : Any> JsonCodingParser<*>.parseValueOfType(source: String): Value =
+	parseValueOfType(JsonReader.build(source))
+
+
+fun <Value : Any> JsonCodingParser<*>.parseValueOfType(source: Reader, valueType: JsonCodingType<Value>, withTermination: Boolean = true) =
+	parseValueOfType(JsonReader.build(source), valueType = valueType, withTermination = withTermination)
+
+
+fun <Value : Any> JsonCodingParser<*>.parseValueOfType(source: String, valueType: JsonCodingType<Value>): Value =
+	parseValueOfType(JsonReader.build(source), valueType = valueType)
+
+
+inline fun <reified Value : Any> JsonCodingParser<*>.parseValueOfTypeOrNull(source: JsonReader, withTermination: Boolean = true): Value? =
+	parseValueOfTypeOrNull(source, valueType = jsonCodingType(), withTermination = withTermination)
+
+
+inline fun <reified Value : Any> JsonCodingParser<*>.parseValueOfTypeOrNull(source: Reader, withTermination: Boolean = true): Value? =
+	parseValueOfTypeOrNull(JsonReader.build(source), withTermination = withTermination)
+
+
+inline fun <reified Value : Any> JsonCodingParser<*>.parseValueOfTypeOrNull(source: String): Value? =
+	parseValueOfTypeOrNull(JsonReader.build(source))
+
+
+fun <Value : Any> JsonCodingParser<*>.parseValueOfTypeOrNull(source: Reader, valueType: JsonCodingType<Value>, withTermination: Boolean = true): Value? =
+	parseValueOfTypeOrNull(JsonReader.build(source), valueType = valueType, withTermination = withTermination)
+
+
+fun <Value : Any> JsonCodingParser<*>.parseValueOfTypeOrNull(source: String, valueType: JsonCodingType<Value>): Value? =
+	parseValueOfTypeOrNull(JsonReader.build(source), valueType = valueType)
+
+
+fun JsonCodingParser<*>.parseValueOrNull(source: Reader, withTermination: Boolean = true) =
+	parseValueOrNull(JsonReader.build(source), withTermination = withTermination)
+
+
+fun JsonCodingParser<*>.parseValueOrNull(source: String) =
+	parseValueOrNull(JsonReader.build(source))
diff --git a/coding/sources/JsonCodingSerializer.kt b/coding/sources/JsonCodingSerializer.kt
new file mode 100644
index 0000000..d324a3f
--- /dev/null
+++ b/coding/sources/JsonCodingSerializer.kt
@@ -0,0 +1,84 @@
+package io.fluidsonic.json
+
+
+interface JsonCodingSerializer : JsonSerializer {
+
+	override fun serializeValue(value: Any?, destination: JsonWriter, withTermination: Boolean)
+
+
+	companion object {
+
+		fun builder(): BuilderForEncoding<JsonCodingContext> =
+			BuilderForEncodingImpl(context = JsonCodingContext.empty)
+
+
+		fun <Context : JsonCodingContext> builder(context: Context): BuilderForEncoding<Context> =
+			BuilderForEncodingImpl(context = context)
+
+
+		val default = builder()
+			.encodingWith()
+			.build()
+
+
+		val nonRecursive = builder()
+			.encodingWith(DefaultJsonCodecs.nonRecursive)
+			.build()
+
+
+		interface BuilderForEncoding<Context : JsonCodingContext> {
+
+			fun encodingWith(factory: (destination: JsonWriter, context: Context) -> JsonEncoder<Context>): Builder
+
+
+			fun encodingWith(
+				vararg providers: JsonCodecProvider<Context>,
+				base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+			) =
+				encodingWith(providers = providers.toList(), base = base)
+
+
+			fun encodingWith(
+				providers: Iterable<JsonCodecProvider<Context>>,
+				base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+			) =
+				encodingWith { destination, context ->
+					JsonEncoder.builder(context)
+						.codecs(JsonCodecProvider(providers), base = base)
+						.destination(destination)
+						.build()
+				}
+		}
+
+
+		private class BuilderForEncodingImpl<Context : JsonCodingContext>(
+			private val context: Context
+		) : BuilderForEncoding<Context> {
+
+			override fun encodingWith(factory: (source: JsonWriter, context: Context) -> JsonEncoder<Context>) =
+				BuilderImpl(
+					context = context,
+					encoderFactory = factory
+				)
+		}
+
+
+		interface Builder {
+
+			fun build(): JsonCodingSerializer
+		}
+
+
+		private class BuilderImpl<out Context : JsonCodingContext>(
+			private val context: Context,
+			private val encoderFactory: (source: JsonWriter, context: Context) -> JsonEncoder<Context>
+		) : Builder {
+
+			override fun build() =
+				StandardCodingSerializer(
+					context = context,
+					encoderFactory = encoderFactory
+				)
+		}
+	}
+}
diff --git a/coding/sources/JSONCodingType.kt b/coding/sources/JsonCodingType.kt
similarity index 78%
rename from coding/sources/JSONCodingType.kt
rename to coding/sources/JsonCodingType.kt
index a5e5511..e55dfa0 100644
--- a/coding/sources/JSONCodingType.kt
+++ b/coding/sources/JsonCodingType.kt
@@ -1,46 +1,32 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
-import java.lang.reflect.GenericArrayType
-import java.lang.reflect.ParameterizedType
-import java.lang.reflect.Type
-import java.lang.reflect.TypeVariable
-import java.lang.reflect.WildcardType
+import java.lang.reflect.*
 import java.util.concurrent.*
-import kotlin.Any
 import kotlin.Array
-import kotlin.Boolean
-import kotlin.Int
-import kotlin.PublishedApi
-import kotlin.String
-import kotlin.Suppress
-import kotlin.check
-import kotlin.error
-import kotlin.let
 import kotlin.reflect.*
-import kotlin.require
 
 
-inline fun <reified Type : Any> jsonCodingType(): JSONCodingType<Type> =
-	object : JSONCodingTypeReference<Type>() {}.type
+inline fun <reified Type : Any> jsonCodingType(): JsonCodingType<Type> =
+	object : JsonCodingTypeReference<Type>() {}.type
 
 
-fun <Type : Any> jsonCodingType(clazz: KClass<Type>, vararg arguments: KClass<*>): JSONCodingType<Type> =
-	JSONCodingType.of(clazz, arguments = * arguments)
+fun <Type : Any> jsonCodingType(clazz: KClass<Type>, vararg arguments: KClass<*>): JsonCodingType<Type> =
+	JsonCodingType.of(clazz, arguments = * arguments)
 
 
 @JvmName("jsonCodingTypeOfReference")
-fun <Type : Any> jsonCodingType(clazz: KClass<out JSONCodingTypeReference<out Type>>): JSONCodingType<Type> {
+fun <Type : Any> jsonCodingType(clazz: KClass<out JsonCodingTypeReference<out Type>>): JsonCodingType<Type> {
 	val javaClass = clazz.java
-	require(javaClass.superclass == JSONCodingTypeReference::class.java) { "An immediate subclass of ${JSONCodingTypeReference::class.simpleName} must be passed" }
+	require(javaClass.superclass == JsonCodingTypeReference::class.java) { "An immediate subclass of ${JsonCodingTypeReference::class.simpleName} must be passed" }
 
 	@Suppress("UNCHECKED_CAST")
-	return JSONCodingType.of((javaClass.genericSuperclass as ParameterizedType).actualTypeArguments.first()!!) as JSONCodingType<Type>
+	return JsonCodingType.of((javaClass.genericSuperclass as ParameterizedType).actualTypeArguments.first()!!) as JsonCodingType<Type>
 }
 
 
-class JSONCodingType<Type : Any> private constructor(
+class JsonCodingType<Type : Any> private constructor(
 	val rawClass: KClass<Type>,
-	val arguments: List<JSONCodingType<*>>,
+	val arguments: List<JsonCodingType<*>>,
 	upperBoundInGenericContext: KClass<*>?,
 	varianceInGenericContext: KVariance
 ) {
@@ -58,7 +44,7 @@ class JSONCodingType<Type : Any> private constructor(
 			return true
 		}
 
-		if (other !is JSONCodingType<*>) {
+		if (other !is JsonCodingType<*>) {
 			return false
 		}
 
@@ -86,12 +72,12 @@ class JSONCodingType<Type : Any> private constructor(
 
 	companion object {
 
-		private val cache = ConcurrentHashMap<Type, JSONCodingType<*>>()
+		private val cache = ConcurrentHashMap<Type, JsonCodingType<*>>()
 
 
 		@PublishedApi
 		@Suppress("UNCHECKED_CAST")
-		internal fun of(type: Type): JSONCodingType<*> =
+		internal fun of(type: Type): JsonCodingType<*> =
 			cache.getOrPut(type) {
 				type.toCodableType(
 					upperBound = null,
@@ -112,9 +98,9 @@ class JSONCodingType<Type : Any> private constructor(
 			upperBound: KClass<*>?,
 			variance: KVariance,
 			explicitArguments: List<KClass<*>>? = null
-		): JSONCodingType<Type> =
+		): JsonCodingType<Type> =
 			if (isArray && !componentType.isPrimitive)
-				JSONCodingType(
+				JsonCodingType(
 					rawClass = kotlin,
 					arguments =
 					explicitArguments?.let { arguments ->
@@ -125,7 +111,7 @@ class JSONCodingType<Type : Any> private constructor(
 					varianceInGenericContext = variance
 				)
 			else
-				JSONCodingType(
+				JsonCodingType(
 					rawClass = kotlin,
 					arguments = explicitArguments
 						?.let { arguments ->
@@ -156,7 +142,7 @@ class JSONCodingType<Type : Any> private constructor(
 
 
 		private fun GenericArrayType.toCodableType(upperBound: KClass<*>?, variance: KVariance) =
-			JSONCodingType(
+			JsonCodingType(
 				rawClass = Array<Any?>::class,
 				arguments = listOf(genericComponentType.toCodableType(
 					upperBound = null,
@@ -167,10 +153,10 @@ class JSONCodingType<Type : Any> private constructor(
 			)
 
 
-		private fun ParameterizedType.toCodableType(upperBound: KClass<*>?, variance: KVariance): JSONCodingType<*> {
+		private fun ParameterizedType.toCodableType(upperBound: KClass<*>?, variance: KVariance): JsonCodingType<*> {
 			val rawClass = (rawType as Class<*>)
 
-			return JSONCodingType(
+			return JsonCodingType(
 				rawClass = rawClass.kotlin,
 				arguments = actualTypeArguments.mapIndexed { index, type ->
 					type.toCodableType(
@@ -219,7 +205,7 @@ class JSONCodingType<Type : Any> private constructor(
 
 
 		@Suppress("UNCHECKED_CAST")
-		private fun Type.toCodableType(upperBound: KClass<*>?, variance: KVariance): JSONCodingType<*> =
+		private fun Type.toCodableType(upperBound: KClass<*>?, variance: KVariance): JsonCodingType<*> =
 			when (this) {
 				is Class<*> -> (this as Class<Any>).toCodableType(upperBound = upperBound, variance = variance)
 				is ParameterizedType -> toCodableType(upperBound = upperBound, variance = variance)
@@ -241,9 +227,9 @@ class JSONCodingType<Type : Any> private constructor(
 }
 
 
-abstract class JSONCodingTypeReference<Type : Any> {
+abstract class JsonCodingTypeReference<Type : Any> {
 
 	@Suppress("UNCHECKED_CAST")
-	internal val type = JSONCodingType.of((this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments.first()!!)
-		as JSONCodingType<Type>
+	internal val type = JsonCodingType.of((this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments.first()!!)
+		as JsonCodingType<Type>
 }
diff --git a/coding/sources/JsonDecoder.kt b/coding/sources/JsonDecoder.kt
new file mode 100644
index 0000000..f3c0e80
--- /dev/null
+++ b/coding/sources/JsonDecoder.kt
@@ -0,0 +1,151 @@
+package io.fluidsonic.json
+
+import java.io.*
+
+
+interface JsonDecoder<out Context : JsonCodingContext> : JsonReader {
+
+	val context: Context
+
+
+	override fun readValue() =
+		readValueOfType<Any>()
+
+
+	fun <Value : Any> readValueOfType(valueType: JsonCodingType<Value>): Value
+
+
+	companion object {
+
+		fun builder(): BuilderForCodecs<JsonCodingContext> =
+			BuilderForCodecsImpl(context = JsonCodingContext.empty)
+
+
+		fun <Context : JsonCodingContext> builder(context: Context): BuilderForCodecs<Context> =
+			BuilderForCodecsImpl(context = context)
+
+
+		interface BuilderForCodecs<out Context : JsonCodingContext> {
+
+			fun codecs(
+				vararg providers: JsonCodecProvider<Context>,
+				base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+			) =
+				codecs(providers = providers.toList(), base = base)
+
+
+			fun codecs(
+				providers: Iterable<JsonCodecProvider<Context>>,
+				base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+			): BuilderForSource<Context>
+		}
+
+
+		private class BuilderForCodecsImpl<out Context : JsonCodingContext>(
+			private val context: Context
+		) : BuilderForCodecs<Context> {
+
+			override fun codecs(
+				providers: Iterable<JsonCodecProvider<Context>>,
+				base: JsonCodecProvider<JsonCodingContext>?
+			) =
+				BuilderForSourceImpl(
+					context = context,
+					codecProvider = JsonCodecProvider(base?.let { providers + it } ?: providers)
+				)
+		}
+
+
+		interface BuilderForSource<out Context : JsonCodingContext> {
+
+			fun source(source: JsonReader): Builder<Context>
+
+
+			fun source(source: Reader) =
+				source(JsonReader.build(source))
+
+
+			fun source(source: String) =
+				source(StringReader(source))
+		}
+
+
+		private class BuilderForSourceImpl<out Context : JsonCodingContext>(
+			private val context: Context,
+			private val codecProvider: JsonCodecProvider<Context>
+		) : BuilderForSource<Context> {
+
+			override fun source(source: JsonReader) =
+				BuilderImpl(
+					context = context,
+					codecProvider = codecProvider,
+					source = source
+				)
+		}
+
+
+		interface Builder<out Context : JsonCodingContext> {
+
+			fun build(): JsonDecoder<Context>
+		}
+
+
+		private class BuilderImpl<out Context : JsonCodingContext>(
+			private val context: Context,
+			private val codecProvider: JsonCodecProvider<Context>,
+			private val source: JsonReader
+		) : Builder<Context> {
+
+			override fun build() =
+				StandardDecoder(
+					context = context,
+					codecProvider = codecProvider,
+					source = source
+				)
+		}
+	}
+}
+
+
+fun JsonDecoder<*>.invalidPropertyError(property: String, details: String): Nothing =
+	schemaError("Invalid value for property '$property': $details")
+
+
+fun JsonDecoder<*>.invalidValueError(details: String): Nothing =
+	schemaError("Invalid value: $details")
+
+
+fun JsonDecoder<*>.missingPropertyError(property: String): Nothing =
+	schemaError("Missing value for property '$property'")
+
+
+fun JsonDecoder<*>.parsingError(message: String): Nothing =
+	throw JsonException.Parsing(
+		message = message,
+		offset = offset,
+		path = path
+	)
+
+
+fun JsonDecoder<*>.readValueOrNull() =
+	if (nextToken != JsonToken.nullValue) readValue() else readNull()
+
+
+inline fun <reified Value : Any> JsonDecoder<*>.readValueOfType() =
+	readValueOfType(jsonCodingType<Value>())
+
+
+inline fun <reified Value : Any> JsonDecoder<*>.readValueOfTypeOrNull() =
+	readValueOfTypeOrNull(jsonCodingType<Value>())
+
+
+fun <Value : Any> JsonDecoder<*>.readValueOfTypeOrNull(valueType: JsonCodingType<Value>) =
+	readOrNull { readValueOfType(valueType) }
+
+
+fun JsonDecoder<*>.schemaError(message: String): Nothing =
+	throw JsonException.Schema(
+		message = message,
+		offset = offset,
+		path = path
+	)
diff --git a/coding/sources/JSONDecoderCodec.kt b/coding/sources/JsonDecoderCodec.kt
similarity index 61%
rename from coding/sources/JSONDecoderCodec.kt
rename to coding/sources/JsonDecoderCodec.kt
index 9fbbd05..6ae2373 100644
--- a/coding/sources/JSONDecoderCodec.kt
+++ b/coding/sources/JsonDecoderCodec.kt
@@ -1,31 +1,31 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import kotlin.reflect.*
 
 
-interface JSONDecoderCodec<Value : Any, in Context : JSONCodingContext> : JSONCodecProvider<Context> {
+interface JsonDecoderCodec<Value : Any, in Context : JsonCodingContext> : JsonCodecProvider<Context> {
 
-	val decodableType: JSONCodingType<Value>
+	val decodableType: JsonCodingType<Value>
 
 
-	fun JSONDecoder<Context>.decode(valueType: JSONCodingType<Value>): Value
+	fun JsonDecoder<Context>.decode(valueType: JsonCodingType<Value>): Value
 
 
 	@Suppress("UNCHECKED_CAST")
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>): JSONDecoderCodec<ActualValue, Context>? =
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>): JsonDecoderCodec<ActualValue, Context>? =
 		if (this.decodableType.satisfiesType(decodableType))
-			this as JSONDecoderCodec<ActualValue, Context>
+			this as JsonDecoderCodec<ActualValue, Context>
 		else
 			null
 
 
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JSONEncoderCodec<ActualValue, Context>? =
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JsonEncoderCodec<ActualValue, Context>? =
 		null
 
 
 	companion object {
 
-		private fun JSONCodingType<*>.satisfiesType(requestedType: JSONCodingType<*>): Boolean {
+		private fun JsonCodingType<*>.satisfiesType(requestedType: JsonCodingType<*>): Boolean {
 			if (isUnconstrainedUpperBoundInGenericContext) {
 				return true
 			}
diff --git a/coding/sources/JsonEncoder.kt b/coding/sources/JsonEncoder.kt
new file mode 100644
index 0000000..35e7a45
--- /dev/null
+++ b/coding/sources/JsonEncoder.kt
@@ -0,0 +1,103 @@
+package io.fluidsonic.json
+
+import java.io.*
+
+
+interface JsonEncoder<out Context : JsonCodingContext> : JsonWriter {
+
+	val context: Context
+
+
+	companion object {
+
+		fun builder(): BuilderForCodecs<JsonCodingContext> =
+			BuilderForCodecsImpl(context = JsonCodingContext.empty)
+
+
+		fun <Context : JsonCodingContext> builder(context: Context): BuilderForCodecs<Context> =
+			BuilderForCodecsImpl(context = context)
+
+
+		interface BuilderForCodecs<out Context : JsonCodingContext> {
+
+			fun codecs(
+				vararg providers: JsonCodecProvider<Context>,
+				base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+			) =
+				codecs(providers = providers.toList(), base = base)
+
+
+			fun codecs(
+				providers: Iterable<JsonCodecProvider<Context>>,
+				base: JsonCodecProvider<JsonCodingContext>? = JsonCodecProvider.extended
+			): BuilderForDestination<Context>
+		}
+
+
+		private class BuilderForCodecsImpl<out Context : JsonCodingContext>(
+			private val context: Context
+		) : BuilderForCodecs<Context> {
+
+			override fun codecs(
+				providers: Iterable<JsonCodecProvider<Context>>,
+				base: JsonCodecProvider<JsonCodingContext>?
+			) =
+				BuilderForDestinationImpl(
+					context = context,
+					codecProvider = JsonCodecProvider(base?.let { providers + it } ?: providers)
+				)
+		}
+
+
+		interface BuilderForDestination<out Context : JsonCodingContext> {
+
+			fun destination(destination: JsonWriter): Builder<Context>
+
+
+			fun destination(destination: Writer) =
+				destination(JsonWriter.build(destination))
+		}
+
+
+		private class BuilderForDestinationImpl<out Context : JsonCodingContext>(
+			private val context: Context,
+			private val codecProvider: JsonCodecProvider<Context>
+		) : BuilderForDestination<Context> {
+
+			override fun destination(destination: JsonWriter) =
+				BuilderImpl(
+					context = context,
+					codecProvider = codecProvider,
+					destination = destination
+				)
+		}
+
+
+		interface Builder<out Context : JsonCodingContext> {
+
+			fun build(): JsonEncoder<Context>
+		}
+
+
+		private class BuilderImpl<out Context : JsonCodingContext>(
+			private val context: Context,
+			private val codecProvider: JsonCodecProvider<Context>,
+			private val destination: JsonWriter
+		) : Builder<Context> {
+
+			override fun build() =
+				StandardEncoder(
+					context = context,
+					codecProvider = codecProvider,
+					destination = destination
+				)
+		}
+	}
+}
+
+
+fun JsonEncoder<*>.serializationError(message: String): Nothing =
+	throw JsonException.Serialization(
+		message = message,
+		path = path
+	)
diff --git a/coding/sources/JsonEncoderCodec.kt b/coding/sources/JsonEncoderCodec.kt
new file mode 100644
index 0000000..6544513
--- /dev/null
+++ b/coding/sources/JsonEncoderCodec.kt
@@ -0,0 +1,27 @@
+package io.fluidsonic.json
+
+import kotlin.reflect.*
+
+
+interface JsonEncoderCodec<in Value : Any, in Context : JsonCodingContext> : JsonCodecProvider<Context> {
+
+	val encodableClass: KClass<in Value>
+
+
+	fun JsonEncoder<Context>.encode(value: Value)
+
+
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>): JsonDecoderCodec<ActualValue, Context>? =
+		null
+
+
+	@Suppress("UNCHECKED_CAST")
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JsonEncoderCodec<ActualValue, Context>? =
+		if (encodableClass.isAssignableOrBoxableTo(this.encodableClass))
+			this as JsonEncoderCodec<ActualValue, Context>
+		else
+			null
+
+
+	companion object
+}
diff --git a/coding/sources/codecs/DefaultJSONCodecs.kt b/coding/sources/codecs/DefaultJSONCodecs.kt
deleted file mode 100644
index f4f0cd8..0000000
--- a/coding/sources/codecs/DefaultJSONCodecs.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import com.github.fluidsonic.fluid.json.dynamic.*
-
-
-object DefaultJSONCodecs {
-
-	val basic: List<JSONCodecProvider<JSONCodingContext>> =
-		listOf(
-			AnyJSONDecoderCodec,
-			ArrayJSONCodec,
-			BooleanArrayJSONCodec,
-			BooleanJSONCodec,
-			ByteArrayJSONCodec,
-			ByteJSONCodec,
-			CharJSONCodec,
-			DoubleArrayJSONCodec,
-			DoubleJSONCodec,
-			FloatArrayJSONCodec,
-			FloatJSONCodec,
-			IntArrayJSONCodec,
-			IntJSONCodec,
-			ListJSONDecoderCodec,
-			LongArrayJSONCodec,
-			LongJSONCodec,
-			MapJSONCodec,
-			SequenceJSONCodec,
-			SetJSONDecoderCodec,
-			ShortArrayJSONCodec,
-			ShortJSONCodec,
-			StringJSONCodec,
-			CollectionJSONCodec, // after subclasses
-			IterableJSONEncoderCodec, // after subclasses
-			NumberJSONCodec // after subclasses
-		)
-
-
-	val extended: List<JSONCodecProvider<JSONCodingContext>> =
-		codingImplementationsJava.extendedCodecProviders()
-
-
-	val nonRecursive: List<JSONCodecProvider<JSONCodingContext>> =
-		listOf(
-			ArrayJSONCodec.nonRecursive,
-			ListJSONDecoderCodec.nonRecursive,
-			MapJSONCodec.nonRecursive,
-			SequenceJSONCodec.nonRecursive,
-			SetJSONDecoderCodec.nonRecursive,
-			CollectionJSONCodec.nonRecursive, // after subclasses
-			IterableJSONEncoderCodec.nonRecursive // after subclasses
-		)
-}
diff --git a/coding/sources/codecs/DefaultJsonCodecs.kt b/coding/sources/codecs/DefaultJsonCodecs.kt
new file mode 100644
index 0000000..9c99458
--- /dev/null
+++ b/coding/sources/codecs/DefaultJsonCodecs.kt
@@ -0,0 +1,52 @@
+package io.fluidsonic.json
+
+import io.fluidsonic.json.dynamic.*
+
+
+object DefaultJsonCodecs {
+
+	val basic: List<JsonCodecProvider<JsonCodingContext>> =
+		listOf(
+			AnyJsonDecoderCodec,
+			ArrayJsonCodec,
+			BooleanArrayJsonCodec,
+			BooleanJsonCodec,
+			ByteArrayJsonCodec,
+			ByteJsonCodec,
+			CharJsonCodec,
+			DoubleArrayJsonCodec,
+			DoubleJsonCodec,
+			FloatArrayJsonCodec,
+			FloatJsonCodec,
+			IntArrayJsonCodec,
+			IntJsonCodec,
+			ListJsonDecoderCodec,
+			LongArrayJsonCodec,
+			LongJsonCodec,
+			MapJsonCodec,
+			SequenceJsonCodec,
+			SetJsonDecoderCodec,
+			ShortArrayJsonCodec,
+			ShortJsonCodec,
+			StringJsonCodec,
+			CollectionJsonCodec, // after subclasses
+			IterableJsonEncoderCodec, // after subclasses
+			NumberJsonCodec // after subclasses
+		)
+
+
+	val extended: List<JsonCodecProvider<JsonCodingContext>> =
+		codingImplementationsJava.extendedCodecProviders()
+
+
+	val nonRecursive: List<JsonCodecProvider<JsonCodingContext>> =
+		listOf(
+			ArrayJsonCodec.nonRecursive,
+			ListJsonDecoderCodec.nonRecursive,
+			MapJsonCodec.nonRecursive,
+			SequenceJsonCodec.nonRecursive,
+			SetJsonDecoderCodec.NON_RECURSIVE,
+			CollectionJsonCodec.nonRecursive, // after subclasses
+			IterableJsonEncoderCodec.nonRecursive // after subclasses
+		)
+}
diff --git a/coding/sources/codecs/basic/AnyJSONDecoderCodec.kt b/coding/sources/codecs/basic/AnyJSONDecoderCodec.kt
deleted file mode 100644
index 9a4d75a..0000000
--- a/coding/sources/codecs/basic/AnyJSONDecoderCodec.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object AnyJSONDecoderCodec : AbstractJSONDecoderCodec<Any, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Any>): Any =
-		when (nextToken) {
-			JSONToken.booleanValue -> readValueOfType<Boolean>()
-			JSONToken.listStart -> readValueOfType<List<*>>()
-			JSONToken.mapKey -> readValueOfType<String>()
-			JSONToken.mapStart -> readValueOfType<Map<*, *>>()
-			JSONToken.numberValue -> readValueOfType<Number>()
-			JSONToken.stringValue -> readValueOfType<String>()
-			else -> invalidValueError("unexpected 'null'")
-		}
-}
diff --git a/coding/sources/codecs/basic/AnyJsonDecoderCodec.kt b/coding/sources/codecs/basic/AnyJsonDecoderCodec.kt
new file mode 100644
index 0000000..62e8313
--- /dev/null
+++ b/coding/sources/codecs/basic/AnyJsonDecoderCodec.kt
@@ -0,0 +1,16 @@
+package io.fluidsonic.json
+
+
+object AnyJsonDecoderCodec : AbstractJsonDecoderCodec<Any, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Any>): Any =
+		when (nextToken) {
+			JsonToken.booleanValue -> readValueOfType<Boolean>()
+			JsonToken.listStart -> readValueOfType<List<*>>()
+			JsonToken.mapKey -> readValueOfType<String>()
+			JsonToken.mapStart -> readValueOfType<Map<*, *>>()
+			JsonToken.numberValue -> readValueOfType<Number>()
+			JsonToken.stringValue -> readValueOfType<String>()
+			else -> invalidValueError("unexpected 'null'")
+		}
+}
diff --git a/coding/sources/codecs/basic/ArrayJSONCodec.kt b/coding/sources/codecs/basic/ArrayJSONCodec.kt
deleted file mode 100644
index 149cb29..0000000
--- a/coding/sources/codecs/basic/ArrayJSONCodec.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object ArrayJSONCodec : AbstractJSONEncoderCodec<Array<out Any?>, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Array<out Any?>) =
-		writeList(value)
-
-
-	val nonRecursive = NonRecursiveJSONEncoderCodec.create<Array<out Any?>>()
-}
diff --git a/coding/sources/codecs/basic/ArrayJsonCodec.kt b/coding/sources/codecs/basic/ArrayJsonCodec.kt
new file mode 100644
index 0000000..9a84830
--- /dev/null
+++ b/coding/sources/codecs/basic/ArrayJsonCodec.kt
@@ -0,0 +1,11 @@
+package io.fluidsonic.json
+
+
+object ArrayJsonCodec : AbstractJsonEncoderCodec<Array<out Any?>, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Array<out Any?>) =
+		writeList(value)
+
+
+	val nonRecursive = NonRecursiveJsonEncoderCodec.create<Array<out Any?>>()
+}
diff --git a/coding/sources/codecs/basic/BooleanArrayJSONCodec.kt b/coding/sources/codecs/basic/BooleanArrayJSONCodec.kt
deleted file mode 100644
index 363dfcc..0000000
--- a/coding/sources/codecs/basic/BooleanArrayJSONCodec.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object BooleanArrayJSONCodec : AbstractJSONEncoderCodec<BooleanArray, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: BooleanArray) =
-		writeList(value)
-}
diff --git a/coding/sources/codecs/basic/BooleanArrayJsonCodec.kt b/coding/sources/codecs/basic/BooleanArrayJsonCodec.kt
new file mode 100644
index 0000000..50594f5
--- /dev/null
+++ b/coding/sources/codecs/basic/BooleanArrayJsonCodec.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+object BooleanArrayJsonCodec : AbstractJsonEncoderCodec<BooleanArray, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: BooleanArray) =
+		writeList(value)
+}
diff --git a/coding/sources/codecs/basic/BooleanJSONCodec.kt b/coding/sources/codecs/basic/BooleanJSONCodec.kt
deleted file mode 100644
index 8ff75c4..0000000
--- a/coding/sources/codecs/basic/BooleanJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object BooleanJSONCodec : AbstractJSONCodec<Boolean, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Boolean>) =
-		readBoolean()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Boolean) =
-		writeBoolean(value)
-}
diff --git a/coding/sources/codecs/basic/BooleanJsonCodec.kt b/coding/sources/codecs/basic/BooleanJsonCodec.kt
new file mode 100644
index 0000000..817234a
--- /dev/null
+++ b/coding/sources/codecs/basic/BooleanJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object BooleanJsonCodec : AbstractJsonCodec<Boolean, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Boolean>) =
+		readBoolean()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Boolean) =
+		writeBoolean(value)
+}
diff --git a/coding/sources/codecs/basic/ByteArrayJSONCodec.kt b/coding/sources/codecs/basic/ByteArrayJSONCodec.kt
deleted file mode 100644
index 2824424..0000000
--- a/coding/sources/codecs/basic/ByteArrayJSONCodec.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object ByteArrayJSONCodec : AbstractJSONEncoderCodec<ByteArray, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: ByteArray) =
-		writeList(value)
-}
diff --git a/coding/sources/codecs/basic/ByteArrayJsonCodec.kt b/coding/sources/codecs/basic/ByteArrayJsonCodec.kt
new file mode 100644
index 0000000..2916602
--- /dev/null
+++ b/coding/sources/codecs/basic/ByteArrayJsonCodec.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+object ByteArrayJsonCodec : AbstractJsonEncoderCodec<ByteArray, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: ByteArray) =
+		writeList(value)
+}
diff --git a/coding/sources/codecs/basic/ByteJSONCodec.kt b/coding/sources/codecs/basic/ByteJSONCodec.kt
deleted file mode 100644
index 10aa085..0000000
--- a/coding/sources/codecs/basic/ByteJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object ByteJSONCodec : AbstractJSONCodec<Byte, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Byte>) =
-		readByte()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Byte) =
-		writeByte(value)
-}
diff --git a/coding/sources/codecs/basic/ByteJsonCodec.kt b/coding/sources/codecs/basic/ByteJsonCodec.kt
new file mode 100644
index 0000000..47cae41
--- /dev/null
+++ b/coding/sources/codecs/basic/ByteJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object ByteJsonCodec : AbstractJsonCodec<Byte, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Byte>) =
+		readByte()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Byte) =
+		writeByte(value)
+}
diff --git a/coding/sources/codecs/basic/CharArrayJSONCodec.kt b/coding/sources/codecs/basic/CharArrayJSONCodec.kt
deleted file mode 100644
index 1662c8a..0000000
--- a/coding/sources/codecs/basic/CharArrayJSONCodec.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object CharArrayJSONCodec : AbstractJSONEncoderCodec<CharArray, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: CharArray) =
-		writeList(value)
-}
diff --git a/coding/sources/codecs/basic/CharArrayJsonCodec.kt b/coding/sources/codecs/basic/CharArrayJsonCodec.kt
new file mode 100644
index 0000000..563cf11
--- /dev/null
+++ b/coding/sources/codecs/basic/CharArrayJsonCodec.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+object CharArrayJsonCodec : AbstractJsonEncoderCodec<CharArray, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: CharArray) =
+		writeList(value)
+}
diff --git a/coding/sources/codecs/basic/CharJSONCodec.kt b/coding/sources/codecs/basic/CharJSONCodec.kt
deleted file mode 100644
index d0c1410..0000000
--- a/coding/sources/codecs/basic/CharJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object CharJSONCodec : AbstractJSONCodec<Char, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Char>) =
-		readChar()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Char) =
-		writeChar(value)
-}
diff --git a/coding/sources/codecs/basic/CharJsonCodec.kt b/coding/sources/codecs/basic/CharJsonCodec.kt
new file mode 100644
index 0000000..8919731
--- /dev/null
+++ b/coding/sources/codecs/basic/CharJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object CharJsonCodec : AbstractJsonCodec<Char, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Char>) =
+		readChar()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Char) =
+		writeChar(value)
+}
diff --git a/coding/sources/codecs/basic/CollectionJSONEncoderCodec.kt b/coding/sources/codecs/basic/CollectionJSONEncoderCodec.kt
deleted file mode 100644
index e8e4fc1..0000000
--- a/coding/sources/codecs/basic/CollectionJSONEncoderCodec.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object CollectionJSONCodec : AbstractJSONCodec<Collection<*>, JSONCodingContext>() {
-
-	@Suppress("UNCHECKED_CAST")
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Collection<*>>): Collection<*> =
-		ListJSONDecoderCodec.run { decode(valueType as JSONCodingType<List<*>>) }
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Collection<*>): Unit =
-		writeList(value)
-
-
-	val nonRecursive: JSONCodec<Collection<*>, JSONCodingContext> = NonRecursiveJSONCodec.create()
-}
diff --git a/coding/sources/codecs/basic/CollectionJsonCodec.kt b/coding/sources/codecs/basic/CollectionJsonCodec.kt
new file mode 100644
index 0000000..fd97607
--- /dev/null
+++ b/coding/sources/codecs/basic/CollectionJsonCodec.kt
@@ -0,0 +1,16 @@
+package io.fluidsonic.json
+
+
+object CollectionJsonCodec : AbstractJsonCodec<Collection<*>, JsonCodingContext>() {
+
+	@Suppress("UNCHECKED_CAST")
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Collection<*>>): Collection<*> =
+		ListJsonDecoderCodec.run { decode(valueType as JsonCodingType<List<*>>) }
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Collection<*>): Unit =
+		writeList(value)
+
+
+	val nonRecursive: JsonCodec<Collection<*>, JsonCodingContext> = NonRecursiveJsonCodec.create()
+}
diff --git a/coding/sources/codecs/basic/DoubleArrayJSONCodec.kt b/coding/sources/codecs/basic/DoubleArrayJSONCodec.kt
deleted file mode 100644
index e046abf..0000000
--- a/coding/sources/codecs/basic/DoubleArrayJSONCodec.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object DoubleArrayJSONCodec : AbstractJSONEncoderCodec<DoubleArray, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: DoubleArray) =
-		writeList(value)
-}
diff --git a/coding/sources/codecs/basic/DoubleArrayJsonCodec.kt b/coding/sources/codecs/basic/DoubleArrayJsonCodec.kt
new file mode 100644
index 0000000..f0c40c8
--- /dev/null
+++ b/coding/sources/codecs/basic/DoubleArrayJsonCodec.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+object DoubleArrayJsonCodec : AbstractJsonEncoderCodec<DoubleArray, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: DoubleArray) =
+		writeList(value)
+}
diff --git a/coding/sources/codecs/basic/DoubleJSONCodec.kt b/coding/sources/codecs/basic/DoubleJSONCodec.kt
deleted file mode 100644
index 02cfd45..0000000
--- a/coding/sources/codecs/basic/DoubleJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object DoubleJSONCodec : AbstractJSONCodec<Double, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Double>) =
-		readDouble()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Double) =
-		writeDouble(value)
-}
diff --git a/coding/sources/codecs/basic/DoubleJsonCodec.kt b/coding/sources/codecs/basic/DoubleJsonCodec.kt
new file mode 100644
index 0000000..5b5badf
--- /dev/null
+++ b/coding/sources/codecs/basic/DoubleJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object DoubleJsonCodec : AbstractJsonCodec<Double, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Double>) =
+		readDouble()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Double) =
+		writeDouble(value)
+}
diff --git a/coding/sources/codecs/basic/FloatArrayJSONCodec.kt b/coding/sources/codecs/basic/FloatArrayJSONCodec.kt
deleted file mode 100644
index dd2a268..0000000
--- a/coding/sources/codecs/basic/FloatArrayJSONCodec.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object FloatArrayJSONCodec : AbstractJSONEncoderCodec<FloatArray, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: FloatArray) =
-		writeList(value)
-}
diff --git a/coding/sources/codecs/basic/FloatArrayJsonCodec.kt b/coding/sources/codecs/basic/FloatArrayJsonCodec.kt
new file mode 100644
index 0000000..3e84d5b
--- /dev/null
+++ b/coding/sources/codecs/basic/FloatArrayJsonCodec.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+object FloatArrayJsonCodec : AbstractJsonEncoderCodec<FloatArray, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: FloatArray) =
+		writeList(value)
+}
diff --git a/coding/sources/codecs/basic/FloatJSONCodec.kt b/coding/sources/codecs/basic/FloatJSONCodec.kt
deleted file mode 100644
index 296a13f..0000000
--- a/coding/sources/codecs/basic/FloatJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object FloatJSONCodec : AbstractJSONCodec<Float, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Float>) =
-		readFloat()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Float) =
-		writeFloat(value)
-}
diff --git a/coding/sources/codecs/basic/FloatJsonCodec.kt b/coding/sources/codecs/basic/FloatJsonCodec.kt
new file mode 100644
index 0000000..ab09955
--- /dev/null
+++ b/coding/sources/codecs/basic/FloatJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object FloatJsonCodec : AbstractJsonCodec<Float, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Float>) =
+		readFloat()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Float) =
+		writeFloat(value)
+}
diff --git a/coding/sources/codecs/basic/IntArrayJSONCodec.kt b/coding/sources/codecs/basic/IntArrayJSONCodec.kt
deleted file mode 100644
index e6f615f..0000000
--- a/coding/sources/codecs/basic/IntArrayJSONCodec.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object IntArrayJSONCodec : AbstractJSONEncoderCodec<IntArray, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: IntArray) =
-		writeList(value)
-}
diff --git a/coding/sources/codecs/basic/IntArrayJsonCodec.kt b/coding/sources/codecs/basic/IntArrayJsonCodec.kt
new file mode 100644
index 0000000..ac0b059
--- /dev/null
+++ b/coding/sources/codecs/basic/IntArrayJsonCodec.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+object IntArrayJsonCodec : AbstractJsonEncoderCodec<IntArray, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: IntArray) =
+		writeList(value)
+}
diff --git a/coding/sources/codecs/basic/IntJSONCodec.kt b/coding/sources/codecs/basic/IntJSONCodec.kt
deleted file mode 100644
index ebe52f5..0000000
--- a/coding/sources/codecs/basic/IntJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object IntJSONCodec : AbstractJSONCodec<Int, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Int>) =
-		readInt()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Int) =
-		writeInt(value)
-}
diff --git a/coding/sources/codecs/basic/IntJsonCodec.kt b/coding/sources/codecs/basic/IntJsonCodec.kt
new file mode 100644
index 0000000..b000727
--- /dev/null
+++ b/coding/sources/codecs/basic/IntJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object IntJsonCodec : AbstractJsonCodec<Int, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Int>) =
+		readInt()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Int) =
+		writeInt(value)
+}
diff --git a/coding/sources/codecs/basic/IterableJSONEncoderCodec.kt b/coding/sources/codecs/basic/IterableJSONEncoderCodec.kt
deleted file mode 100644
index db1be1a..0000000
--- a/coding/sources/codecs/basic/IterableJSONEncoderCodec.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object IterableJSONEncoderCodec : AbstractJSONEncoderCodec<Iterable<*>, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Iterable<*>) =
-		writeList(value)
-
-
-	val nonRecursive = NonRecursiveJSONEncoderCodec.create<Iterable<*>>()
-}
diff --git a/coding/sources/codecs/basic/IterableJsonEncoderCodec.kt b/coding/sources/codecs/basic/IterableJsonEncoderCodec.kt
new file mode 100644
index 0000000..3a6a579
--- /dev/null
+++ b/coding/sources/codecs/basic/IterableJsonEncoderCodec.kt
@@ -0,0 +1,11 @@
+package io.fluidsonic.json
+
+
+object IterableJsonEncoderCodec : AbstractJsonEncoderCodec<Iterable<*>, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Iterable<*>) =
+		writeList(value)
+
+
+	val nonRecursive = NonRecursiveJsonEncoderCodec.create<Iterable<*>>()
+}
diff --git a/coding/sources/codecs/basic/ListJSONDecoderCodec.kt b/coding/sources/codecs/basic/ListJSONDecoderCodec.kt
deleted file mode 100644
index ada31a0..0000000
--- a/coding/sources/codecs/basic/ListJSONDecoderCodec.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object ListJSONDecoderCodec : AbstractJSONDecoderCodec<List<*>, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<List<*>>): List<*> {
-		val elementType = valueType.arguments.single()
-
-		return readListByElement {
-			readValueOfTypeOrNull(elementType)
-		}
-	}
-
-
-	val nonRecursive = NonRecursiveJSONDecoderCodec.create<List<*>>()
-}
diff --git a/coding/sources/codecs/basic/ListJsonDecoderCodec.kt b/coding/sources/codecs/basic/ListJsonDecoderCodec.kt
new file mode 100644
index 0000000..e631f81
--- /dev/null
+++ b/coding/sources/codecs/basic/ListJsonDecoderCodec.kt
@@ -0,0 +1,16 @@
+package io.fluidsonic.json
+
+
+object ListJsonDecoderCodec : AbstractJsonDecoderCodec<List<*>, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<List<*>>): List<*> {
+		val elementType = valueType.arguments.single()
+
+		return readListByElement {
+			readValueOfTypeOrNull(elementType)
+		}
+	}
+
+
+	val nonRecursive = NonRecursiveJsonDecoderCodec.create<List<*>>()
+}
diff --git a/coding/sources/codecs/basic/LongArrayJSONCodec.kt b/coding/sources/codecs/basic/LongArrayJSONCodec.kt
deleted file mode 100644
index 5c66bf7..0000000
--- a/coding/sources/codecs/basic/LongArrayJSONCodec.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object LongArrayJSONCodec : AbstractJSONEncoderCodec<LongArray, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: LongArray) =
-		writeList(value)
-}
diff --git a/coding/sources/codecs/basic/LongArrayJsonCodec.kt b/coding/sources/codecs/basic/LongArrayJsonCodec.kt
new file mode 100644
index 0000000..1e42916
--- /dev/null
+++ b/coding/sources/codecs/basic/LongArrayJsonCodec.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+object LongArrayJsonCodec : AbstractJsonEncoderCodec<LongArray, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: LongArray) =
+		writeList(value)
+}
diff --git a/coding/sources/codecs/basic/LongJSONCodec.kt b/coding/sources/codecs/basic/LongJSONCodec.kt
deleted file mode 100644
index 1fae8af..0000000
--- a/coding/sources/codecs/basic/LongJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object LongJSONCodec : AbstractJSONCodec<Long, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Long>) =
-		readLong()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Long) =
-		writeLong(value)
-}
diff --git a/coding/sources/codecs/basic/LongJsonCodec.kt b/coding/sources/codecs/basic/LongJsonCodec.kt
new file mode 100644
index 0000000..84ee977
--- /dev/null
+++ b/coding/sources/codecs/basic/LongJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object LongJsonCodec : AbstractJsonCodec<Long, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Long>) =
+		readLong()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Long) =
+		writeLong(value)
+}
diff --git a/coding/sources/codecs/basic/MapJSONCodec.kt b/coding/sources/codecs/basic/MapJSONCodec.kt
deleted file mode 100644
index 3efcedb..0000000
--- a/coding/sources/codecs/basic/MapJSONCodec.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object MapJSONCodec : AbstractJSONCodec<Map<*, *>, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Map<*, *>>): Map<*, *> {
-		val (elementKeyType, elementValueType) = valueType.arguments
-
-		return readMapByElement {
-			readValueOfTypeOrNull(elementKeyType) to readValueOfTypeOrNull(elementValueType)
-		}
-	}
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Map<*, *>) =
-		writeMap(value)
-
-
-	val nonRecursive = NonRecursiveJSONCodec.create<Map<String, *>>()
-}
diff --git a/coding/sources/codecs/basic/MapJsonCodec.kt b/coding/sources/codecs/basic/MapJsonCodec.kt
new file mode 100644
index 0000000..c856d23
--- /dev/null
+++ b/coding/sources/codecs/basic/MapJsonCodec.kt
@@ -0,0 +1,20 @@
+package io.fluidsonic.json
+
+
+object MapJsonCodec : AbstractJsonCodec<Map<*, *>, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Map<*, *>>): Map<*, *> {
+		val (elementKeyType, elementValueType) = valueType.arguments
+
+		return readMapByElement {
+			readValueOfTypeOrNull(elementKeyType) to readValueOfTypeOrNull(elementValueType)
+		}
+	}
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Map<*, *>) =
+		writeMap(value)
+
+
+	val nonRecursive = NonRecursiveJsonCodec.create<Map<String, *>>()
+}
diff --git a/coding/sources/codecs/basic/NonRecursiveJSONCodec.kt b/coding/sources/codecs/basic/NonRecursiveJSONCodec.kt
deleted file mode 100644
index d341cff..0000000
--- a/coding/sources/codecs/basic/NonRecursiveJSONCodec.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import kotlin.reflect.*
-
-
-internal abstract class NonRecursiveJSONCodec<Value : Any> private constructor(
-	private val encoder: NonRecursiveJSONEncoderCodec<Value>
-) :
-	NonRecursiveJSONDecoderCodec<Value>(),
-	JSONCodec<Value, JSONCodingContext>,
-	JSONEncoderCodec<Value, JSONCodingContext> by encoder {
-
-
-	override val encodableClass
-		get() = encoder.encodableClass
-
-
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>) =
-		super<NonRecursiveJSONDecoderCodec>.decoderCodecForType(decodableType)
-
-
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>) =
-		encoder.encoderCodecForClass(encodableClass)
-
-
-	companion object {
-
-		inline fun <reified Value : Any> create(): JSONCodec<Value, JSONCodingContext> =
-			object : NonRecursiveJSONCodec<Value>(
-				encoder = NonRecursiveJSONEncoderCodec(encodableClass = Value::class)
-			) {}
-	}
-}
diff --git a/coding/sources/codecs/basic/NonRecursiveJSONEncoderCodec.kt b/coding/sources/codecs/basic/NonRecursiveJSONEncoderCodec.kt
deleted file mode 100644
index fcfe86c..0000000
--- a/coding/sources/codecs/basic/NonRecursiveJSONEncoderCodec.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-import kotlin.reflect.*
-
-
-internal class NonRecursiveJSONEncoderCodec<Value : Any>(
-	override val encodableClass: KClass<Value>
-) : JSONEncoderCodec<Value, JSONCodingContext> {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Value) {
-		JSONSerializer.default.serializeValue(value, destination = this, withTermination = false)
-	}
-
-
-	companion object {
-
-		inline fun <reified Value : Any> create(): JSONEncoderCodec<Value, JSONCodingContext> =
-			NonRecursiveJSONEncoderCodec(encodableClass = Value::class)
-	}
-}
diff --git a/coding/sources/codecs/basic/NonRecursiveJsonCodec.kt b/coding/sources/codecs/basic/NonRecursiveJsonCodec.kt
new file mode 100644
index 0000000..d97526b
--- /dev/null
+++ b/coding/sources/codecs/basic/NonRecursiveJsonCodec.kt
@@ -0,0 +1,33 @@
+package io.fluidsonic.json
+
+import kotlin.reflect.*
+
+
+internal abstract class NonRecursiveJsonCodec<Value : Any> private constructor(
+	private val encoder: NonRecursiveJsonEncoderCodec<Value>
+) :
+	NonRecursiveJsonDecoderCodec<Value>(),
+	JsonCodec<Value, JsonCodingContext>,
+	JsonEncoderCodec<Value, JsonCodingContext> by encoder {
+
+
+	override val encodableClass
+		get() = encoder.encodableClass
+
+
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>) =
+		super<NonRecursiveJsonDecoderCodec>.decoderCodecForType(decodableType)
+
+
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>) =
+		encoder.encoderCodecForClass(encodableClass)
+
+
+	companion object {
+
+		inline fun <reified Value : Any> create(): JsonCodec<Value, JsonCodingContext> =
+			object : NonRecursiveJsonCodec<Value>(
+				encoder = NonRecursiveJsonEncoderCodec(encodableClass = Value::class)
+			) {}
+	}
+}
diff --git a/coding/sources/codecs/basic/NonRecursiveJSONDecoderCodec.kt b/coding/sources/codecs/basic/NonRecursiveJsonDecoderCodec.kt
similarity index 56%
rename from coding/sources/codecs/basic/NonRecursiveJSONDecoderCodec.kt
rename to coding/sources/codecs/basic/NonRecursiveJsonDecoderCodec.kt
index 2ba92be..a32340c 100644
--- a/coding/sources/codecs/basic/NonRecursiveJSONDecoderCodec.kt
+++ b/coding/sources/codecs/basic/NonRecursiveJsonDecoderCodec.kt
@@ -1,7 +1,7 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal abstract class NonRecursiveJSONDecoderCodec<Value : Any> : AbstractJSONDecoderCodec<Value, JSONCodingContext>() {
+internal abstract class NonRecursiveJsonDecoderCodec<Value : Any> : AbstractJsonDecoderCodec<Value, JsonCodingContext>() {
 
 	private val expectedFirstToken = when (decodableType.rawClass) {
 		Collection::class,
@@ -9,26 +9,26 @@ internal abstract class NonRecursiveJSONDecoderCodec<Value : Any> : AbstractJSON
 		List::class,
 		Sequence::class,
 		Set::class ->
-			JSONToken.listStart
+			JsonToken.listStart
 
 		Map::class ->
-			JSONToken.mapStart
+			JsonToken.mapStart
 
 		else -> error("Cannot decode $decodableType")
 	}
 
 
 	@Suppress("UNCHECKED_CAST")
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Value>): Value {
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Value>): Value {
 		if (nextToken != expectedFirstToken) {
-			throw JSONException.Schema(
+			throw JsonException.Schema(
 				message = "Cannot decode $nextToken as $valueType",
 				offset = offset,
 				path = path
 			)
 		}
 
-		val value = JSONParser.default.parseValueOrNull(this, withTermination = false)
+		val value = JsonParser.default.parseValueOrNull(this, withTermination = false)
 
 		return when {
 			Sequence::class.java.isAssignableFrom(valueType.rawClass.java) -> (value as Iterable<*>).asSequence() as Value
@@ -40,7 +40,7 @@ internal abstract class NonRecursiveJSONDecoderCodec<Value : Any> : AbstractJSON
 
 	companion object {
 
-		inline fun <reified Value : Any> create(): JSONDecoderCodec<Value, JSONCodingContext> =
-			object : NonRecursiveJSONDecoderCodec<Value>() {}
+		inline fun <reified Value : Any> create(): JsonDecoderCodec<Value, JsonCodingContext> =
+			object : NonRecursiveJsonDecoderCodec<Value>() {}
 	}
 }
diff --git a/coding/sources/codecs/basic/NonRecursiveJsonEncoderCodec.kt b/coding/sources/codecs/basic/NonRecursiveJsonEncoderCodec.kt
new file mode 100644
index 0000000..f42e415
--- /dev/null
+++ b/coding/sources/codecs/basic/NonRecursiveJsonEncoderCodec.kt
@@ -0,0 +1,20 @@
+package io.fluidsonic.json
+
+import kotlin.reflect.*
+
+
+internal class NonRecursiveJsonEncoderCodec<Value : Any>(
+	override val encodableClass: KClass<Value>
+) : JsonEncoderCodec<Value, JsonCodingContext> {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Value) {
+		JsonSerializer.default.serializeValue(value, destination = this, withTermination = false)
+	}
+
+
+	companion object {
+
+		inline fun <reified Value : Any> create(): JsonEncoderCodec<Value, JsonCodingContext> =
+			NonRecursiveJsonEncoderCodec(encodableClass = Value::class)
+	}
+}
diff --git a/coding/sources/codecs/basic/NumberJSONCodec.kt b/coding/sources/codecs/basic/NumberJSONCodec.kt
deleted file mode 100644
index 2ac950e..0000000
--- a/coding/sources/codecs/basic/NumberJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object NumberJSONCodec : AbstractJSONCodec<Number, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Number>) =
-		readNumber()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Number) =
-		writeNumber(value)
-}
diff --git a/coding/sources/codecs/basic/NumberJsonCodec.kt b/coding/sources/codecs/basic/NumberJsonCodec.kt
new file mode 100644
index 0000000..fadd5b3
--- /dev/null
+++ b/coding/sources/codecs/basic/NumberJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object NumberJsonCodec : AbstractJsonCodec<Number, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Number>) =
+		readNumber()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Number) =
+		writeNumber(value)
+}
diff --git a/coding/sources/codecs/basic/SequenceJSONCodec.kt b/coding/sources/codecs/basic/SequenceJSONCodec.kt
deleted file mode 100644
index a961a7a..0000000
--- a/coding/sources/codecs/basic/SequenceJSONCodec.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object SequenceJSONCodec : AbstractJSONCodec<Sequence<*>, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Sequence<*>>): Sequence<*> {
-		val elementType = valueType.arguments.single()
-
-		return readListByElement {
-			readValueOfTypeOrNull(elementType)
-		}.asSequence()
-	}
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Sequence<*>) =
-		writeList(value)
-
-
-	val nonRecursive = NonRecursiveJSONCodec.create<Sequence<*>>()
-}
diff --git a/coding/sources/codecs/basic/SequenceJsonCodec.kt b/coding/sources/codecs/basic/SequenceJsonCodec.kt
new file mode 100644
index 0000000..3e6a6cf
--- /dev/null
+++ b/coding/sources/codecs/basic/SequenceJsonCodec.kt
@@ -0,0 +1,20 @@
+package io.fluidsonic.json
+
+
+object SequenceJsonCodec : AbstractJsonCodec<Sequence<*>, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Sequence<*>>): Sequence<*> {
+		val elementType = valueType.arguments.single()
+
+		return readListByElement {
+			readValueOfTypeOrNull(elementType)
+		}.asSequence()
+	}
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Sequence<*>) =
+		writeList(value)
+
+
+	val nonRecursive = NonRecursiveJsonCodec.create<Sequence<*>>()
+}
diff --git a/coding/sources/codecs/basic/SetJSONDecoderCodec.kt b/coding/sources/codecs/basic/SetJSONDecoderCodec.kt
deleted file mode 100644
index 6eb3c39..0000000
--- a/coding/sources/codecs/basic/SetJSONDecoderCodec.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object SetJSONDecoderCodec : AbstractJSONDecoderCodec<Set<*>, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Set<*>>): Set<*> {
-		val elementType = valueType.arguments.single()
-
-		return mutableSetOf<Any?>().also { set ->
-			readFromListByElement {
-				set += readValueOfTypeOrNull(elementType)
-			}
-		}
-	}
-
-
-	val nonRecursive: JSONDecoderCodec<Set<*>, JSONCodingContext> = NonRecursiveJSONDecoderCodec.create()
-}
diff --git a/coding/sources/codecs/basic/SetJsonDecoderCodec.kt b/coding/sources/codecs/basic/SetJsonDecoderCodec.kt
new file mode 100644
index 0000000..3f10d79
--- /dev/null
+++ b/coding/sources/codecs/basic/SetJsonDecoderCodec.kt
@@ -0,0 +1,18 @@
+package io.fluidsonic.json
+
+
+object SetJsonDecoderCodec : AbstractJsonDecoderCodec<Set<*>, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Set<*>>): Set<*> {
+		val elementType = valueType.arguments.single()
+
+		return mutableSetOf<Any?>().also { set ->
+			readFromListByElement {
+				set += readValueOfTypeOrNull(elementType)
+			}
+		}
+	}
+
+
+	val NON_RECURSIVE: JsonDecoderCodec<Set<*>, JsonCodingContext> = NonRecursiveJsonDecoderCodec.create()
+}
diff --git a/coding/sources/codecs/basic/ShortArrayJSONCodec.kt b/coding/sources/codecs/basic/ShortArrayJSONCodec.kt
deleted file mode 100644
index 5283ccb..0000000
--- a/coding/sources/codecs/basic/ShortArrayJSONCodec.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object ShortArrayJSONCodec : AbstractJSONEncoderCodec<ShortArray, JSONCodingContext>() {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: ShortArray) =
-		writeList(value)
-}
diff --git a/coding/sources/codecs/basic/ShortArrayJsonCodec.kt b/coding/sources/codecs/basic/ShortArrayJsonCodec.kt
new file mode 100644
index 0000000..9a11949
--- /dev/null
+++ b/coding/sources/codecs/basic/ShortArrayJsonCodec.kt
@@ -0,0 +1,8 @@
+package io.fluidsonic.json
+
+
+object ShortArrayJsonCodec : AbstractJsonEncoderCodec<ShortArray, JsonCodingContext>() {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: ShortArray) =
+		writeList(value)
+}
diff --git a/coding/sources/codecs/basic/ShortJSONCodec.kt b/coding/sources/codecs/basic/ShortJSONCodec.kt
deleted file mode 100644
index 48a2483..0000000
--- a/coding/sources/codecs/basic/ShortJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object ShortJSONCodec : AbstractJSONCodec<Short, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Short>) =
-		readShort()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Short) =
-		writeShort(value)
-}
diff --git a/coding/sources/codecs/basic/ShortJsonCodec.kt b/coding/sources/codecs/basic/ShortJsonCodec.kt
new file mode 100644
index 0000000..ef30e25
--- /dev/null
+++ b/coding/sources/codecs/basic/ShortJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object ShortJsonCodec : AbstractJsonCodec<Short, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Short>) =
+		readShort()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Short) =
+		writeShort(value)
+}
diff --git a/coding/sources/codecs/basic/StringJSONCodec.kt b/coding/sources/codecs/basic/StringJSONCodec.kt
deleted file mode 100644
index 8bc874e..0000000
--- a/coding/sources/codecs/basic/StringJSONCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-object StringJSONCodec : AbstractJSONCodec<String, JSONCodingContext>() {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<String>) =
-		readString()
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: String) =
-		writeString(value)
-}
diff --git a/coding/sources/codecs/basic/StringJsonCodec.kt b/coding/sources/codecs/basic/StringJsonCodec.kt
new file mode 100644
index 0000000..f50a3b9
--- /dev/null
+++ b/coding/sources/codecs/basic/StringJsonCodec.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+object StringJsonCodec : AbstractJsonCodec<String, JsonCodingContext>() {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<String>) =
+		readString()
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: String) =
+		writeString(value)
+}
diff --git a/coding/sources/codecs/extended/CharRangeJSONCodec.kt b/coding/sources/codecs/extended/CharRangeJsonCodec.kt
similarity index 75%
rename from coding/sources/codecs/extended/CharRangeJSONCodec.kt
rename to coding/sources/codecs/extended/CharRangeJsonCodec.kt
index 3988093..4661c91 100644
--- a/coding/sources/codecs/extended/CharRangeJSONCodec.kt
+++ b/coding/sources/codecs/extended/CharRangeJsonCodec.kt
@@ -1,9 +1,9 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-object CharRangeJSONCodec : AbstractJSONCodec<CharRange, JSONCodingContext>() {
+object CharRangeJsonCodec : AbstractJsonCodec<CharRange, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<CharRange>): CharRange {
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<CharRange>): CharRange {
 		var endInclusive = 0.toChar()
 		var endInclusiveProvided = false
 		var start = 0.toChar()
@@ -30,7 +30,7 @@ object CharRangeJSONCodec : AbstractJSONCodec<CharRange, JSONCodingContext>() {
 	}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: CharRange) {
+	override fun JsonEncoder<JsonCodingContext>.encode(value: CharRange) {
 		writeIntoMap {
 			writeMapElement(Fields.start, char = value.first)
 			writeMapElement(Fields.endInclusive, char = value.last)
diff --git a/coding/sources/codecs/extended/ClosedRangeJSONCodec.kt b/coding/sources/codecs/extended/ClosedRangeJsonCodec.kt
similarity index 73%
rename from coding/sources/codecs/extended/ClosedRangeJSONCodec.kt
rename to coding/sources/codecs/extended/ClosedRangeJsonCodec.kt
index e140914..cc53559 100644
--- a/coding/sources/codecs/extended/ClosedRangeJSONCodec.kt
+++ b/coding/sources/codecs/extended/ClosedRangeJsonCodec.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-object ClosedRangeJSONCodec : AbstractJSONCodec<ClosedRange<*>, JSONCodingContext>() {
+object ClosedRangeJsonCodec : AbstractJsonCodec<ClosedRange<*>, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<ClosedRange<*>>): ClosedRange<*> {
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<ClosedRange<*>>): ClosedRange<*> {
 		@Suppress("UNCHECKED_CAST")
-		val elementType = valueType.arguments.single() as JSONCodingType<Comparable<Any>>
+		val elementType = valueType.arguments.single() as JsonCodingType<Comparable<Any>>
 
 		return when (elementType.rawClass) {
 			Char::class -> decodeCharRange()
@@ -20,7 +20,7 @@ object ClosedRangeJSONCodec : AbstractJSONCodec<ClosedRange<*>, JSONCodingContex
 
 
 	@Suppress("UNCHECKED_CAST")
-	private fun JSONDecoder<JSONCodingContext>.decodeComparableRange(): ClosedRange<*> {
+	private fun JsonDecoder<JsonCodingContext>.decodeComparableRange(): ClosedRange<*> {
 		var endInclusive: Comparable<Any>? = null
 		var start: Comparable<Any>? = null
 
@@ -40,11 +40,11 @@ object ClosedRangeJSONCodec : AbstractJSONCodec<ClosedRange<*>, JSONCodingContex
 	}
 
 
-	private fun JSONDecoder<JSONCodingContext>.decodeCharRange() =
-		CharRangeJSONCodec.run { decode(valueType = CharRangeJSONCodec.decodableType) }
+	private fun JsonDecoder<JsonCodingContext>.decodeCharRange() =
+		CharRangeJsonCodec.run { decode(valueType = CharRangeJsonCodec.decodableType) }
 
 
-	private fun JSONDecoder<JSONCodingContext>.decodeDoubleRange(): ClosedFloatingPointRange<Double> {
+	private fun JsonDecoder<JsonCodingContext>.decodeDoubleRange(): ClosedFloatingPointRange<Double> {
 		var endInclusive = 0.0
 		var endInclusiveProvided = false
 		var start = 0.0
@@ -71,7 +71,7 @@ object ClosedRangeJSONCodec : AbstractJSONCodec<ClosedRange<*>, JSONCodingContex
 	}
 
 
-	private fun JSONDecoder<JSONCodingContext>.decodeFloatRange(): ClosedFloatingPointRange<Float> {
+	private fun JsonDecoder<JsonCodingContext>.decodeFloatRange(): ClosedFloatingPointRange<Float> {
 		var endInclusive = 0.0f
 		var endInclusiveProvided = false
 		var start = 0.0f
@@ -98,15 +98,15 @@ object ClosedRangeJSONCodec : AbstractJSONCodec<ClosedRange<*>, JSONCodingContex
 	}
 
 
-	private fun JSONDecoder<JSONCodingContext>.decodeIntRange() =
-		IntRangeJSONCodec.run { decode(valueType = IntRangeJSONCodec.decodableType) }
+	private fun JsonDecoder<JsonCodingContext>.decodeIntRange() =
+		IntRangeJsonCodec.run { decode(valueType = IntRangeJsonCodec.decodableType) }
 
 
-	private fun JSONDecoder<JSONCodingContext>.decodeLongRange() =
-		LongRangeJSONCodec.run { decode(valueType = LongRangeJSONCodec.decodableType) }
+	private fun JsonDecoder<JsonCodingContext>.decodeLongRange() =
+		LongRangeJsonCodec.run { decode(valueType = LongRangeJsonCodec.decodableType) }
 
 
-	private fun JSONDecoder<JSONCodingContext>.decodeOtherRange(elementType: JSONCodingType<Comparable<Any>>): ClosedRange<*> {
+	private fun JsonDecoder<JsonCodingContext>.decodeOtherRange(elementType: JsonCodingType<Comparable<Any>>): ClosedRange<*> {
 		var endInclusive: Comparable<Any>? = null
 		var start: Comparable<Any>? = null
 
@@ -122,7 +122,7 @@ object ClosedRangeJSONCodec : AbstractJSONCodec<ClosedRange<*>, JSONCodingContex
 	}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: ClosedRange<*>) {
+	override fun JsonEncoder<JsonCodingContext>.encode(value: ClosedRange<*>) {
 		writeIntoMap {
 			writeMapElement(Fields.start, value = value.start)
 			writeMapElement(Fields.endInclusive, value = value.endInclusive)
diff --git a/coding/sources/codecs/extended/EnumJSONCodecProvider.kt b/coding/sources/codecs/extended/EnumJSONCodecProvider.kt
deleted file mode 100644
index 05b7702..0000000
--- a/coding/sources/codecs/extended/EnumJSONCodecProvider.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.fluidsonic.fluid.json
-
-
-@Suppress("UNCHECKED_CAST")
-class EnumJSONCodecProvider(
-	val transformation: EnumJSONTransformation
-) : JSONCodecProvider<JSONCodingContext> by JSONCodecProvider.factoryOf<Enum<*>>({ enumClass ->
-	EnumJSONCodec(
-		enumClass = enumClass,
-		transformation = transformation
-	) as EnumJSONCodec<Enum<*>>
-})
diff --git a/coding/sources/codecs/extended/EnumJSONCodec.kt b/coding/sources/codecs/extended/EnumJsonCodec.kt
similarity index 59%
rename from coding/sources/codecs/extended/EnumJSONCodec.kt
rename to coding/sources/codecs/extended/EnumJsonCodec.kt
index b363b16..3be40fd 100644
--- a/coding/sources/codecs/extended/EnumJSONCodec.kt
+++ b/coding/sources/codecs/extended/EnumJsonCodec.kt
@@ -1,17 +1,17 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import kotlin.reflect.*
 
 
-sealed class EnumJSONCodec<Value : Enum<*>>(enumClass: KClass<Value>) : AbstractJSONCodec<Value, JSONCodingContext>(
+sealed class EnumJsonCodec<Value : Enum<*>>(enumClass: KClass<Value>) : AbstractJsonCodec<Value, JsonCodingContext>(
 	decodableType = jsonCodingType(enumClass)
 ) {
 
 	internal class OrdinalBased<Value : Enum<*>>(
 		enumClass: KClass<Value>
-	) : EnumJSONCodec<Value>(enumClass = enumClass) {
+	) : EnumJsonCodec<Value>(enumClass = enumClass) {
 
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Value>): Value {
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Value>): Value {
 			@Suppress("UNCHECKED_CAST")
 			val values = valueType.rawClass.java.enumConstants as Array<out Value>
 
@@ -23,7 +23,7 @@ sealed class EnumJSONCodec<Value : Enum<*>>(enumClass: KClass<Value>) : Abstract
 		}
 
 
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Value) {
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Value) {
 			writeInt(value.ordinal)
 		}
 	}
@@ -32,7 +32,7 @@ sealed class EnumJSONCodec<Value : Enum<*>>(enumClass: KClass<Value>) : Abstract
 	internal class StringBased<Value : Enum<*>>(
 		enumClass: KClass<Value>,
 		strings: List<String>
-	) : EnumJSONCodec<Value>(enumClass = enumClass) {
+	) : EnumJsonCodec<Value>(enumClass = enumClass) {
 
 		private val values: Array<Pair<Value, String>>
 
@@ -48,14 +48,14 @@ sealed class EnumJSONCodec<Value : Enum<*>>(enumClass: KClass<Value>) : Abstract
 		}
 
 
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Value>) =
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Value>) =
 			readString().let { name ->
 				values.firstOrNull { it.second == name }?.first
 					?: invalidValueError("expected one of: ${values.joinToString { "\"${it.second}\"" }}")
 			}
 
 
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Value) {
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Value) {
 			writeString(values.first { it.first === value }.second)
 		}
 	}
@@ -63,32 +63,32 @@ sealed class EnumJSONCodec<Value : Enum<*>>(enumClass: KClass<Value>) : Abstract
 
 
 @Suppress("FunctionName")
-inline fun <reified Value : Enum<Value>> EnumJSONCodec(
-	transformation: EnumJSONTransformation
+inline fun <reified Value : Enum<Value>> EnumJsonCodec(
+	transformation: EnumJsonTransformation
 ) =
-	EnumJSONCodec(
+	EnumJsonCodec(
 		enumClass = Value::class,
 		transformation = transformation
 	)
 
 
 @Suppress("FunctionName")
-fun <Value : Enum<*>> EnumJSONCodec(
+fun <Value : Enum<*>> EnumJsonCodec(
 	enumClass: KClass<Value>,
-	transformation: EnumJSONTransformation
-): EnumJSONCodec<Value> =
+	transformation: EnumJsonTransformation
+): EnumJsonCodec<Value> =
 	when (transformation) {
-		is EnumJSONTransformation.Name ->
-			EnumJSONCodec.StringBased(
+		is EnumJsonTransformation.Name ->
+			EnumJsonCodec.StringBased(
 				enumClass = enumClass,
 				strings = enumClass.java.enumConstants.map { transformation.case.convert(it.name) }
 			)
 
-		is EnumJSONTransformation.Ordinal ->
-			EnumJSONCodec.OrdinalBased(enumClass = enumClass)
+		is EnumJsonTransformation.Ordinal ->
+			EnumJsonCodec.OrdinalBased(enumClass = enumClass)
 
-		is EnumJSONTransformation.ToString ->
-			EnumJSONCodec.StringBased(
+		is EnumJsonTransformation.ToString ->
+			EnumJsonCodec.StringBased(
 				enumClass = enumClass,
 				strings = enumClass.java.enumConstants.map { transformation.case.convert(it.toString()) }
 			)
diff --git a/coding/sources/codecs/extended/EnumJsonCodecProvider.kt b/coding/sources/codecs/extended/EnumJsonCodecProvider.kt
new file mode 100644
index 0000000..fc51eae
--- /dev/null
+++ b/coding/sources/codecs/extended/EnumJsonCodecProvider.kt
@@ -0,0 +1,12 @@
+package io.fluidsonic.json
+
+
+@Suppress("UNCHECKED_CAST")
+class EnumJsonCodecProvider(
+	val transformation: EnumJsonTransformation
+) : JsonCodecProvider<JsonCodingContext> by JsonCodecProvider.factoryOf<Enum<*>>({ enumClass ->
+	EnumJsonCodec(
+		enumClass = enumClass,
+		transformation = transformation
+	) as EnumJsonCodec<Enum<*>>
+})
diff --git a/coding/sources/codecs/extended/EnumJSONTransformation.kt b/coding/sources/codecs/extended/EnumJsonTransformation.kt
similarity index 91%
rename from coding/sources/codecs/extended/EnumJSONTransformation.kt
rename to coding/sources/codecs/extended/EnumJsonTransformation.kt
index e64fdaa..ca45238 100644
--- a/coding/sources/codecs/extended/EnumJSONTransformation.kt
+++ b/coding/sources/codecs/extended/EnumJsonTransformation.kt
@@ -1,13 +1,13 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
-import com.github.fluidsonic.fluid.json.EnumJSONTransformation.*
+import io.fluidsonic.json.EnumJsonTransformation.*
 
 
-sealed class EnumJSONTransformation {
+sealed class EnumJsonTransformation {
 
-	class Name(val case: Case? = null) : EnumJSONTransformation()
-	object Ordinal : EnumJSONTransformation()
-	class ToString(val case: Case? = null) : EnumJSONTransformation()
+	class Name(val case: Case? = null) : EnumJsonTransformation()
+	object Ordinal : EnumJsonTransformation()
+	class ToString(val case: Case? = null) : EnumJsonTransformation()
 
 
 	@Suppress("EnumEntryName")
diff --git a/coding/sources/codecs/extended/IntRangeJSONCodec.kt b/coding/sources/codecs/extended/IntRangeJsonCodec.kt
similarity index 74%
rename from coding/sources/codecs/extended/IntRangeJSONCodec.kt
rename to coding/sources/codecs/extended/IntRangeJsonCodec.kt
index 1c5182a..ac6adb6 100644
--- a/coding/sources/codecs/extended/IntRangeJSONCodec.kt
+++ b/coding/sources/codecs/extended/IntRangeJsonCodec.kt
@@ -1,9 +1,9 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-object IntRangeJSONCodec : AbstractJSONCodec<IntRange, JSONCodingContext>() {
+object IntRangeJsonCodec : AbstractJsonCodec<IntRange, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<IntRange>): IntRange {
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<IntRange>): IntRange {
 		var endInclusive = 0
 		var endInclusiveProvided = false
 		var start = 0
@@ -30,7 +30,7 @@ object IntRangeJSONCodec : AbstractJSONCodec<IntRange, JSONCodingContext>() {
 	}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: IntRange) {
+	override fun JsonEncoder<JsonCodingContext>.encode(value: IntRange) {
 		writeIntoMap {
 			writeMapElement(Fields.start, int = value.first)
 			writeMapElement(Fields.endInclusive, int = value.last)
diff --git a/coding/sources/codecs/extended/LongRangeJSONCodec.kt b/coding/sources/codecs/extended/LongRangeJsonCodec.kt
similarity index 74%
rename from coding/sources/codecs/extended/LongRangeJSONCodec.kt
rename to coding/sources/codecs/extended/LongRangeJsonCodec.kt
index c756f31..c851573 100644
--- a/coding/sources/codecs/extended/LongRangeJSONCodec.kt
+++ b/coding/sources/codecs/extended/LongRangeJsonCodec.kt
@@ -1,9 +1,9 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-object LongRangeJSONCodec : AbstractJSONCodec<LongRange, JSONCodingContext>() {
+object LongRangeJsonCodec : AbstractJsonCodec<LongRange, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<LongRange>): LongRange {
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<LongRange>): LongRange {
 		var endInclusive = 0L
 		var endInclusiveProvided = false
 		var start = 0L
@@ -30,7 +30,7 @@ object LongRangeJSONCodec : AbstractJSONCodec<LongRange, JSONCodingContext>() {
 	}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: LongRange) {
+	override fun JsonEncoder<JsonCodingContext>.encode(value: LongRange) {
 		writeIntoMap {
 			writeMapElement(Fields.start, long = value.first)
 			writeMapElement(Fields.endInclusive, long = value.last)
diff --git a/coding/sources/implementations/AbstractJSONCodec.kt b/coding/sources/implementations/AbstractJsonCodec.kt
similarity index 64%
rename from coding/sources/implementations/AbstractJSONCodec.kt
rename to coding/sources/implementations/AbstractJsonCodec.kt
index 4f5061b..b03d442 100644
--- a/coding/sources/implementations/AbstractJSONCodec.kt
+++ b/coding/sources/implementations/AbstractJsonCodec.kt
@@ -1,22 +1,22 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.lang.reflect.*
 import kotlin.reflect.*
 
 
-abstract class AbstractJSONCodec<Value : Any, in Context : JSONCodingContext>(
-	private val additionalProviders: List<JSONCodecProvider<Context>> = emptyList(),
-	decodableType: JSONCodingType<Value>? = null
-) : JSONCodec<Value, Context> {
+abstract class AbstractJsonCodec<Value : Any, in Context : JsonCodingContext>(
+	private val additionalProviders: List<JsonCodecProvider<Context>> = emptyList(),
+	decodableType: JsonCodingType<Value>? = null
+) : JsonCodec<Value, Context> {
 
 	@Suppress("UNCHECKED_CAST")
 	final override val decodableType = decodableType
-		?: JSONCodingType.of((this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments[0]) as JSONCodingType<Value>
+		?: JsonCodingType.of((this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments[0]) as JsonCodingType<Value>
 
 	final override val encodableClass = this.decodableType.rawClass
 
 
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>): JSONDecoderCodec<ActualValue, Context>? {
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>): JsonDecoderCodec<ActualValue, Context>? {
 		var codec = super.decoderCodecForType(decodableType)
 		if (codec != null) {
 			return codec
@@ -33,7 +33,7 @@ abstract class AbstractJSONCodec<Value : Any, in Context : JSONCodingContext>(
 	}
 
 
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JSONEncoderCodec<ActualValue, Context>? {
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JsonEncoderCodec<ActualValue, Context>? {
 		var codec = super.encoderCodecForClass(encodableClass)
 		if (codec != null) {
 			return codec
diff --git a/coding/sources/implementations/AbstractJSONDecoderCodec.kt b/coding/sources/implementations/AbstractJsonDecoderCodec.kt
similarity index 58%
rename from coding/sources/implementations/AbstractJSONDecoderCodec.kt
rename to coding/sources/implementations/AbstractJsonDecoderCodec.kt
index a134d89..a3522c0 100644
--- a/coding/sources/implementations/AbstractJSONDecoderCodec.kt
+++ b/coding/sources/implementations/AbstractJsonDecoderCodec.kt
@@ -1,20 +1,20 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.lang.reflect.*
 import kotlin.reflect.*
 
 
-abstract class AbstractJSONDecoderCodec<Value : Any, in Context : JSONCodingContext>(
-	private val additionalProviders: List<JSONCodecProvider<Context>> = emptyList(),
-	decodableType: JSONCodingType<Value>? = null
-) : JSONDecoderCodec<Value, Context> {
+abstract class AbstractJsonDecoderCodec<Value : Any, in Context : JsonCodingContext>(
+	private val additionalProviders: List<JsonCodecProvider<Context>> = emptyList(),
+	decodableType: JsonCodingType<Value>? = null
+) : JsonDecoderCodec<Value, Context> {
 
 	@Suppress("UNCHECKED_CAST")
 	final override val decodableType = decodableType
-		?: JSONCodingType.of((this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments[0]) as JSONCodingType<Value>
+		?: JsonCodingType.of((this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments[0]) as JsonCodingType<Value>
 
 
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>): JSONDecoderCodec<ActualValue, Context>? {
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>): JsonDecoderCodec<ActualValue, Context>? {
 		var codec = super.decoderCodecForType(decodableType)
 		if (codec != null) {
 			return codec
@@ -31,7 +31,7 @@ abstract class AbstractJSONDecoderCodec<Value : Any, in Context : JSONCodingCont
 	}
 
 
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JSONEncoderCodec<ActualValue, Context>? {
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JsonEncoderCodec<ActualValue, Context>? {
 		for (provider in additionalProviders) {
 			val codec = provider.encoderCodecForClass(encodableClass)
 			if (codec != null) {
diff --git a/coding/sources/implementations/AbstractJSONEncoderCodec.kt b/coding/sources/implementations/AbstractJsonEncoderCodec.kt
similarity index 66%
rename from coding/sources/implementations/AbstractJSONEncoderCodec.kt
rename to coding/sources/implementations/AbstractJsonEncoderCodec.kt
index d3e94fb..5749048 100644
--- a/coding/sources/implementations/AbstractJSONEncoderCodec.kt
+++ b/coding/sources/implementations/AbstractJsonEncoderCodec.kt
@@ -1,20 +1,20 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.lang.reflect.*
 import kotlin.reflect.*
 
 
-abstract class AbstractJSONEncoderCodec<Value : Any, in Context : JSONCodingContext>(
-	private val additionalProviders: List<JSONCodecProvider<Context>> = emptyList(),
+abstract class AbstractJsonEncoderCodec<Value : Any, in Context : JsonCodingContext>(
+	private val additionalProviders: List<JsonCodecProvider<Context>> = emptyList(),
 	encodableClass: KClass<Value>? = null
-) : JSONEncoderCodec<Value, Context> {
+) : JsonEncoderCodec<Value, Context> {
 
 	@Suppress("UNCHECKED_CAST")
 	final override val encodableClass = encodableClass
-		?: JSONCodingType.of((this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments[0]).rawClass as KClass<Value>
+		?: JsonCodingType.of((this::class.java.genericSuperclass as ParameterizedType).actualTypeArguments[0]).rawClass as KClass<Value>
 
 
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>): JSONDecoderCodec<ActualValue, Context>? {
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>): JsonDecoderCodec<ActualValue, Context>? {
 		for (provider in additionalProviders) {
 			val codec = provider.decoderCodecForType(decodableType)
 			if (codec != null) {
@@ -26,7 +26,7 @@ abstract class AbstractJSONEncoderCodec<Value : Any, in Context : JSONCodingCont
 	}
 
 
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JSONEncoderCodec<ActualValue, Context>? {
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JsonEncoderCodec<ActualValue, Context>? {
 		var codec = super.encoderCodecForClass(encodableClass)
 		if (codec != null) {
 			return codec
diff --git a/coding/sources/implementations/FactoryCodecProvider.kt b/coding/sources/implementations/FactoryCodecProvider.kt
index 6e9d376..b54ffb7 100644
--- a/coding/sources/implementations/FactoryCodecProvider.kt
+++ b/coding/sources/implementations/FactoryCodecProvider.kt
@@ -1,23 +1,23 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.util.concurrent.*
 import kotlin.reflect.*
 
 
-internal class FactoryCodecProvider<out Value : Any, in Context : JSONCodingContext> internal constructor(
+internal class FactoryCodecProvider<out Value : Any, in Context : JsonCodingContext> internal constructor(
 	private val valueClass: KClass<Value>,
-	private val factory: (actualClass: KClass<out Value>) -> JSONCodecProvider<Context>?
-) : JSONCodecProvider<Context> {
+	private val factory: (actualClass: KClass<out Value>) -> JsonCodecProvider<Context>?
+) : JsonCodecProvider<Context> {
 
 	private val codecsByClass = ConcurrentHashMap<KClass<*>, Codecs<*, Context>>()
 
 
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>): JSONDecoderCodec<ActualValue, Context>? =
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>): JsonDecoderCodec<ActualValue, Context>? =
 		decodableType.rawClass.takeIfSubclassOf(valueClass)
 			?.let { codecsForClass(it).decoderCodec }
 
 
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JSONEncoderCodec<ActualValue, Context>? =
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JsonEncoderCodec<ActualValue, Context>? =
 		encodableClass.takeIfSubclassOf(valueClass)
 			?.let { codecsForClass(it).encoderCodec }
 
@@ -36,169 +36,169 @@ internal class FactoryCodecProvider<out Value : Any, in Context : JSONCodingCont
 		} as Codecs<ActualValue, Context>
 
 
-	private data class Codecs<Value : Any, in Context : JSONCodingContext>(
-		val decoderCodec: JSONDecoderCodec<Value, Context>?,
-		val encoderCodec: JSONEncoderCodec<Value, Context>?
+	private data class Codecs<Value : Any, in Context : JsonCodingContext>(
+		val decoderCodec: JsonDecoderCodec<Value, Context>?,
+		val encoderCodec: JsonEncoderCodec<Value, Context>?
 	) {
 
 		companion object {
 
-			private val empty: Codecs<Any, JSONCodingContext> = Codecs(decoderCodec = null, encoderCodec = null)
+			private val empty: Codecs<Any, JsonCodingContext> = Codecs(decoderCodec = null, encoderCodec = null)
 
 
 			@Suppress("UNCHECKED_CAST")
 			fun <Value : Any> empty() =
-				empty as Codecs<Value, JSONCodingContext>
+				empty as Codecs<Value, JsonCodingContext>
 		}
 	}
 }
 
 
-@JvmName("JSONCodecProviderForDecoding")
+@JvmName("JsonCodecProviderForDecoding")
 @Suppress("FunctionName")
-fun JSONCodecProvider.Companion.factory(
-	factory: (valueClass: KClass<out Any>) -> JSONDecoderCodec<Any, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
-	JSONCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
+fun JsonCodecProvider.Companion.factory(
+	factory: (valueClass: KClass<out Any>) -> JsonDecoderCodec<Any, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
+	JsonCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForDecodingWithContext")
+@JvmName("JsonCodecProviderForDecodingWithContext")
 @Suppress("FunctionName")
-fun <Context : JSONCodingContext> JSONCodecProvider.Companion.factory(
-	factory: (valueClass: KClass<out Any>) -> JSONDecoderCodec<Any, Context>?
-): JSONCodecProvider<Context> =
-	JSONCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
+fun <Context : JsonCodingContext> JsonCodecProvider.Companion.factory(
+	factory: (valueClass: KClass<out Any>) -> JsonDecoderCodec<Any, Context>?
+): JsonCodecProvider<Context> =
+	JsonCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForEncoding")
+@JvmName("JsonCodecProviderForEncoding")
 @Suppress("FunctionName")
-fun JSONCodecProvider.Companion.factory(
-	factory: (valueClass: KClass<out Any>) -> JSONEncoderCodec<Any, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
-	JSONCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
+fun JsonCodecProvider.Companion.factory(
+	factory: (valueClass: KClass<out Any>) -> JsonEncoderCodec<Any, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
+	JsonCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForEncodingWithContext")
+@JvmName("JsonCodecProviderForEncodingWithContext")
 @Suppress("FunctionName")
-fun <Context : JSONCodingContext> JSONCodecProvider.Companion.factory(
-	factory: (valueClass: KClass<out Any>) -> JSONEncoderCodec<Any, Context>?
-): JSONCodecProvider<Context> =
-	JSONCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
+fun <Context : JsonCodingContext> JsonCodecProvider.Companion.factory(
+	factory: (valueClass: KClass<out Any>) -> JsonEncoderCodec<Any, Context>?
+): JsonCodecProvider<Context> =
+	JsonCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForCoding")
+@JvmName("JsonCodecProviderForCoding")
 @Suppress("FunctionName")
-fun JSONCodecProvider.Companion.factory(
-	factory: (valueClass: KClass<out Any>) -> JSONCodec<Any, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
-	JSONCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
+fun JsonCodecProvider.Companion.factory(
+	factory: (valueClass: KClass<out Any>) -> JsonCodec<Any, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
+	JsonCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForCodingWithContext")
+@JvmName("JsonCodecProviderForCodingWithContext")
 @Suppress("FunctionName")
-fun <Context : JSONCodingContext> JSONCodecProvider.Companion.factory(
-	factory: (valueClass: KClass<out Any>) -> JSONCodec<Any, Context>?
-): JSONCodecProvider<Context> =
-	JSONCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
+fun <Context : JsonCodingContext> JsonCodecProvider.Companion.factory(
+	factory: (valueClass: KClass<out Any>) -> JsonCodec<Any, Context>?
+): JsonCodecProvider<Context> =
+	JsonCodecProvider.factoryOf(valueClass = Any::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForDecodingSpecificValue")
+@JvmName("JsonCodecProviderForDecodingSpecificValue")
 @Suppress("FunctionName")
-inline fun <reified Value : Any> JSONCodecProvider.Companion.factoryOf(
-	noinline factory: (valueClass: KClass<out Value>) -> JSONDecoderCodec<Value, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
-	JSONCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
+inline fun <reified Value : Any> JsonCodecProvider.Companion.factoryOf(
+	noinline factory: (valueClass: KClass<out Value>) -> JsonDecoderCodec<Value, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
+	JsonCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForDecodingSpecificValue")
+@JvmName("JsonCodecProviderForDecodingSpecificValue")
 @Suppress("FunctionName")
-fun <Value : Any> JSONCodecProvider.Companion.factoryOf(
+fun <Value : Any> JsonCodecProvider.Companion.factoryOf(
 	valueClass: KClass<out Value>,
-	factory: (valueClass: KClass<out Value>) -> JSONDecoderCodec<Value, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
+	factory: (valueClass: KClass<out Value>) -> JsonDecoderCodec<Value, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
 	FactoryCodecProvider(valueClass = valueClass, factory = factory)
 
 
-@JvmName("JSONCodecProviderForDecodingSpecificValueWithContext")
+@JvmName("JsonCodecProviderForDecodingSpecificValueWithContext")
 @Suppress("FunctionName")
-inline fun <reified Value : Any, Context : JSONCodingContext> JSONCodecProvider.Companion.factoryOf(
-	noinline factory: (valueClass: KClass<out Value>) -> JSONDecoderCodec<Value, Context>?
-): JSONCodecProvider<Context> =
-	JSONCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
+inline fun <reified Value : Any, Context : JsonCodingContext> JsonCodecProvider.Companion.factoryOf(
+	noinline factory: (valueClass: KClass<out Value>) -> JsonDecoderCodec<Value, Context>?
+): JsonCodecProvider<Context> =
+	JsonCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForDecodingSpecificValueWithContext")
+@JvmName("JsonCodecProviderForDecodingSpecificValueWithContext")
 @Suppress("FunctionName")
-fun <Value : Any, Context : JSONCodingContext> JSONCodecProvider.Companion.factoryOf(
+fun <Value : Any, Context : JsonCodingContext> JsonCodecProvider.Companion.factoryOf(
 	valueClass: KClass<out Value>,
-	factory: (valueClass: KClass<out Value>) -> JSONDecoderCodec<Value, Context>?
-): JSONCodecProvider<Context> =
+	factory: (valueClass: KClass<out Value>) -> JsonDecoderCodec<Value, Context>?
+): JsonCodecProvider<Context> =
 	FactoryCodecProvider(valueClass = valueClass, factory = factory)
 
 
-@JvmName("JSONCodecProviderForEncodingSpecificValue")
+@JvmName("JsonCodecProviderForEncodingSpecificValue")
 @Suppress("FunctionName")
-inline fun <reified Value : Any> JSONCodecProvider.Companion.factoryOf(
-	noinline factory: (valueClass: KClass<out Value>) -> JSONEncoderCodec<Value, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
-	JSONCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
+inline fun <reified Value : Any> JsonCodecProvider.Companion.factoryOf(
+	noinline factory: (valueClass: KClass<out Value>) -> JsonEncoderCodec<Value, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
+	JsonCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForEncodingSpecificValue")
+@JvmName("JsonCodecProviderForEncodingSpecificValue")
 @Suppress("FunctionName")
-fun <Value : Any> JSONCodecProvider.Companion.factoryOf(
+fun <Value : Any> JsonCodecProvider.Companion.factoryOf(
 	valueClass: KClass<out Value>,
-	factory: (valueClass: KClass<out Value>) -> JSONEncoderCodec<Value, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
+	factory: (valueClass: KClass<out Value>) -> JsonEncoderCodec<Value, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
 	FactoryCodecProvider(valueClass = valueClass, factory = factory)
 
 
-@JvmName("JSONCodecProviderForEncodingSpecificValueWithContext")
+@JvmName("JsonCodecProviderForEncodingSpecificValueWithContext")
 @Suppress("FunctionName")
-inline fun <reified Value : Any, Context : JSONCodingContext> JSONCodecProvider.Companion.factoryOf(
-	noinline factory: (valueClass: KClass<out Value>) -> JSONEncoderCodec<Value, Context>?
-): JSONCodecProvider<Context> =
-	JSONCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
+inline fun <reified Value : Any, Context : JsonCodingContext> JsonCodecProvider.Companion.factoryOf(
+	noinline factory: (valueClass: KClass<out Value>) -> JsonEncoderCodec<Value, Context>?
+): JsonCodecProvider<Context> =
+	JsonCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForEncodingSpecificValueWithContext")
+@JvmName("JsonCodecProviderForEncodingSpecificValueWithContext")
 @Suppress("FunctionName")
-fun <Value : Any, Context : JSONCodingContext> JSONCodecProvider.Companion.factoryOf(
+fun <Value : Any, Context : JsonCodingContext> JsonCodecProvider.Companion.factoryOf(
 	valueClass: KClass<out Value>,
-	factory: (valueClass: KClass<out Value>) -> JSONEncoderCodec<Value, Context>?
-): JSONCodecProvider<Context> =
+	factory: (valueClass: KClass<out Value>) -> JsonEncoderCodec<Value, Context>?
+): JsonCodecProvider<Context> =
 	FactoryCodecProvider(valueClass = valueClass, factory = factory)
 
 
-@JvmName("JSONCodecProviderForCodingSpecificValue")
+@JvmName("JsonCodecProviderForCodingSpecificValue")
 @Suppress("FunctionName")
-inline fun <reified Value : Any> JSONCodecProvider.Companion.factoryOf(
-	noinline factory: (valueClass: KClass<out Value>) -> JSONCodec<Value, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
-	JSONCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
+inline fun <reified Value : Any> JsonCodecProvider.Companion.factoryOf(
+	noinline factory: (valueClass: KClass<out Value>) -> JsonCodec<Value, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
+	JsonCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForCodingSpecificValue")
+@JvmName("JsonCodecProviderForCodingSpecificValue")
 @Suppress("FunctionName")
-fun <Value : Any> JSONCodecProvider.Companion.factoryOf(
+fun <Value : Any> JsonCodecProvider.Companion.factoryOf(
 	valueClass: KClass<out Value>,
-	factory: (valueClass: KClass<out Value>) -> JSONCodec<Value, JSONCodingContext>?
-): JSONCodecProvider<JSONCodingContext> =
+	factory: (valueClass: KClass<out Value>) -> JsonCodec<Value, JsonCodingContext>?
+): JsonCodecProvider<JsonCodingContext> =
 	FactoryCodecProvider(valueClass = valueClass, factory = factory)
 
 
-@JvmName("JSONCodecProviderForCodingSpecificValueWithContext")
+@JvmName("JsonCodecProviderForCodingSpecificValueWithContext")
 @Suppress("FunctionName")
-inline fun <reified Value : Any, Context : JSONCodingContext> JSONCodecProvider.Companion.factoryOf(
-	noinline factory: (valueClass: KClass<out Value>) -> JSONCodec<Value, Context>?
-): JSONCodecProvider<Context> =
-	JSONCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
+inline fun <reified Value : Any, Context : JsonCodingContext> JsonCodecProvider.Companion.factoryOf(
+	noinline factory: (valueClass: KClass<out Value>) -> JsonCodec<Value, Context>?
+): JsonCodecProvider<Context> =
+	JsonCodecProvider.factoryOf(valueClass = Value::class, factory = factory)
 
 
-@JvmName("JSONCodecProviderForCodingSpecificValueWithContext")
+@JvmName("JsonCodecProviderForCodingSpecificValueWithContext")
 @Suppress("FunctionName")
-fun <Value : Any, Context : JSONCodingContext> JSONCodecProvider.Companion.factoryOf(
+fun <Value : Any, Context : JsonCodingContext> JsonCodecProvider.Companion.factoryOf(
 	valueClass: KClass<out Value>,
-	factory: (valueClass: KClass<out Value>) -> JSONCodec<Value, Context>?
-): JSONCodecProvider<Context> =
+	factory: (valueClass: KClass<out Value>) -> JsonCodec<Value, Context>?
+): JsonCodecProvider<Context> =
 	FactoryCodecProvider(valueClass = valueClass, factory = factory)
diff --git a/coding/sources/implementations/FixedCodecProvider.kt b/coding/sources/implementations/FixedCodecProvider.kt
index a284b5d..a5c7915 100644
--- a/coding/sources/implementations/FixedCodecProvider.kt
+++ b/coding/sources/implementations/FixedCodecProvider.kt
@@ -1,21 +1,21 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import java.util.concurrent.*
 import kotlin.reflect.*
 
 
-internal class FixedCodecProvider<in Context : JSONCodingContext>(
-	providers: Iterable<JSONCodecProvider<Context>>
-) : JSONCodecProvider<Context> {
+internal class FixedCodecProvider<in Context : JsonCodingContext>(
+	providers: Iterable<JsonCodecProvider<Context>>
+) : JsonCodecProvider<Context> {
 
 	private val providers = providers.toSet().toTypedArray()
 
-	private val decoderCodecByType = ConcurrentHashMap<JSONCodingType<*>, JSONDecoderCodec<*, Context>>()
-	private val encoderCodecByClass = ConcurrentHashMap<KClass<*>, JSONEncoderCodec<*, Context>>()
+	private val decoderCodecByType = ConcurrentHashMap<JsonCodingType<*>, JsonDecoderCodec<*, Context>>()
+	private val encoderCodecByClass = ConcurrentHashMap<KClass<*>, JsonEncoderCodec<*, Context>>()
 
 
 	@Suppress("LoopToCallChain", "UNCHECKED_CAST")
-	override fun <ActualValue : Any> decoderCodecForType(decodableType: JSONCodingType<ActualValue>): JSONDecoderCodec<ActualValue, Context>? {
+	override fun <ActualValue : Any> decoderCodecForType(decodableType: JsonCodingType<ActualValue>): JsonDecoderCodec<ActualValue, Context>? {
 		return decoderCodecByType.getOrPut(decodableType) {
 			for (provider in providers) {
 				val decoder = provider.decoderCodecForType(decodableType)
@@ -25,12 +25,12 @@ internal class FixedCodecProvider<in Context : JSONCodingContext>(
 			}
 
 			return null
-		} as JSONDecoderCodec<ActualValue, Context>
+		} as JsonDecoderCodec<ActualValue, Context>
 	}
 
 
 	@Suppress("LoopToCallChain", "UNCHECKED_CAST")
-	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JSONEncoderCodec<ActualValue, Context>? {
+	override fun <ActualValue : Any> encoderCodecForClass(encodableClass: KClass<ActualValue>): JsonEncoderCodec<ActualValue, Context>? {
 		return encoderCodecByClass.getOrPut(encodableClass) {
 			for (provider in providers) {
 				val encoder = provider.encoderCodecForClass(encodableClass)
@@ -40,20 +40,20 @@ internal class FixedCodecProvider<in Context : JSONCodingContext>(
 			}
 
 			return null
-		} as JSONEncoderCodec<ActualValue, Context>
+		} as JsonEncoderCodec<ActualValue, Context>
 	}
 }
 
 
 @Suppress("FunctionName")
-fun <Context : JSONCodingContext> JSONCodecProvider(
-	vararg providers: JSONCodecProvider<Context>
+fun <Context : JsonCodingContext> JsonCodecProvider(
+	vararg providers: JsonCodecProvider<Context>
 ) =
-	JSONCodecProvider(providers.asIterable())
+	JsonCodecProvider(providers.asIterable())
 
 
 @Suppress("FunctionName")
-fun <Context : JSONCodingContext> JSONCodecProvider(
-	providers: Iterable<JSONCodecProvider<Context>>
-): JSONCodecProvider<Context> =
+fun <Context : JsonCodingContext> JsonCodecProvider(
+	providers: Iterable<JsonCodecProvider<Context>>
+): JsonCodecProvider<Context> =
 	FixedCodecProvider(providers = providers)
diff --git a/coding/sources/implementations/StandardCodingParser.kt b/coding/sources/implementations/StandardCodingParser.kt
index 6323183..531155c 100644
--- a/coding/sources/implementations/StandardCodingParser.kt
+++ b/coding/sources/implementations/StandardCodingParser.kt
@@ -1,11 +1,11 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal class StandardCodingParser<out Context : JSONCodingContext>(
+internal class StandardCodingParser<out Context : JsonCodingContext>(
 	private val context: Context,
-	private val decoderFactory: (source: JSONReader, context: Context) -> JSONDecoder<Context>
-) : JSONCodingParser<Context> {
+	private val decoderFactory: (source: JsonReader, context: Context) -> JsonDecoder<Context>
+) : JsonCodingParser<Context> {
 
-	override fun createDecoder(source: JSONReader) =
+	override fun createDecoder(source: JsonReader) =
 		decoderFactory(source, context)
 }
diff --git a/coding/sources/implementations/StandardCodingSerializer.kt b/coding/sources/implementations/StandardCodingSerializer.kt
index a01845d..9196c31 100644
--- a/coding/sources/implementations/StandardCodingSerializer.kt
+++ b/coding/sources/implementations/StandardCodingSerializer.kt
@@ -1,12 +1,12 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal class StandardCodingSerializer<out Context : JSONCodingContext>(
+internal class StandardCodingSerializer<out Context : JsonCodingContext>(
 	private val context: Context,
-	private val encoderFactory: (destination: JSONWriter, context: Context) -> JSONEncoder<Context>
-) : JSONCodingSerializer {
+	private val encoderFactory: (destination: JsonWriter, context: Context) -> JsonEncoder<Context>
+) : JsonCodingSerializer {
 
-	override fun serializeValue(value: Any?, destination: JSONWriter, withTermination: Boolean) {
+	override fun serializeValue(value: Any?, destination: JsonWriter, withTermination: Boolean) {
 		encoderFactory(destination, context)
 			.withTermination(withTermination) { writeValueOrNull(value) }
 	}
diff --git a/coding/sources/implementations/StandardDecoder.kt b/coding/sources/implementations/StandardDecoder.kt
index 59576a4..2c3f414 100644
--- a/coding/sources/implementations/StandardDecoder.kt
+++ b/coding/sources/implementations/StandardDecoder.kt
@@ -1,17 +1,17 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal class StandardDecoder<out Context : JSONCodingContext>(
+internal class StandardDecoder<out Context : JsonCodingContext>(
 	override val context: Context,
-	private val codecProvider: JSONCodecProvider<Context>,
-	source: JSONReader
-) : JSONDecoder<Context>, JSONReader by source {
+	private val codecProvider: JsonCodecProvider<Context>,
+	source: JsonReader
+) : JsonDecoder<Context>, JsonReader by source {
 
 	override fun readValue() =
-		super<JSONDecoder>.readValue()
+		super<JsonDecoder>.readValue()
 
 
-	override fun <Value : Any> readValueOfType(valueType: JSONCodingType<Value>) =
+	override fun <Value : Any> readValueOfType(valueType: JsonCodingType<Value>) =
 		codecProvider.decoderCodecForType(valueType)
 			?.run {
 				try {
@@ -19,13 +19,13 @@ internal class StandardDecoder<out Context : JSONCodingContext>(
 						decode(valueType = valueType)
 					}
 				}
-				catch (e: JSONException) {
+				catch (e: JsonException) {
 					// TODO remove .java once KT-28418 is fixed
-					e.addSuppressed(JSONException.Parsing("… when decoding value of type $valueType using ${this::class.java.name}"))
+					e.addSuppressed(JsonException.Parsing("… when decoding value of type $valueType using ${this::class.java.name}"))
 					throw e
 				}
 			}
-			?: throw JSONException.Parsing(
+			?: throw JsonException.Parsing(
 				message = "No decoder codec registered for $valueType",
 				offset = offset,
 				path = path
diff --git a/coding/sources/implementations/StandardEncoder.kt b/coding/sources/implementations/StandardEncoder.kt
index 44c54f7..514126f 100644
--- a/coding/sources/implementations/StandardEncoder.kt
+++ b/coding/sources/implementations/StandardEncoder.kt
@@ -1,29 +1,29 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 
-internal class StandardEncoder<out Context : JSONCodingContext>(
+internal class StandardEncoder<out Context : JsonCodingContext>(
 	override val context: Context,
-	private val codecProvider: JSONCodecProvider<Context>,
-	private val destination: JSONWriter
-) : JSONEncoder<Context>, JSONWriter by destination {
+	private val codecProvider: JsonCodecProvider<Context>,
+	private val destination: JsonWriter
+) : JsonEncoder<Context>, JsonWriter by destination {
 
 	@Suppress("UNCHECKED_CAST")
 	override fun writeValue(value: Any) {
 		withErrorChecking {
-			(codecProvider.encoderCodecForClass(value::class) as JSONEncoderCodec<Any, Context>?)
+			(codecProvider.encoderCodecForClass(value::class) as JsonEncoderCodec<Any, Context>?)
 				?.run {
 					try {
 						isolateValueWrite {
 							encode(value = value)
 						}
 					}
-					catch (e: JSONException) {
+					catch (e: JsonException) {
 						// TODO remove .java once KT-28418 is fixed
-						e.addSuppressed(JSONException.Serialization("… when encoding value of ${value::class} using ${this::class.java.name}: $value"))
+						e.addSuppressed(JsonException.Serialization("… when encoding value of ${value::class} using ${this::class.java.name}: $value"))
 						throw e
 					}
 				}
-				?: throw JSONException.Serialization(
+				?: throw JsonException.Serialization(
 					message = "No encoder codec registered for ${value::class}: $value",
 					path = path
 				)
diff --git a/coding/sources/utility/KClass.kt b/coding/sources/utility/KClass.kt
index 0f6d53d..42ec363 100644
--- a/coding/sources/utility/KClass.kt
+++ b/coding/sources/utility/KClass.kt
@@ -1,8 +1,7 @@
 @file:Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
 
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
-import kotlin.Any
 import kotlin.Boolean
 import kotlin.Byte
 import kotlin.Char
@@ -11,9 +10,7 @@ import kotlin.Float
 import kotlin.Int
 import kotlin.Long
 import kotlin.Short
-import kotlin.Suppress
 import kotlin.reflect.*
-import kotlin.takeIf
 import java.lang.Boolean as BoxedBoolean
 import java.lang.Byte as BoxedByte
 import java.lang.Character as BoxedCharacter
diff --git a/coding/sources/utility/KType.kt b/coding/sources/utility/KType.kt
index 8a5de32..4a68964 100644
--- a/coding/sources/utility/KType.kt
+++ b/coding/sources/utility/KType.kt
@@ -1,4 +1,4 @@
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import kotlin.reflect.*
 import kotlin.reflect.jvm.internal.*
diff --git a/coding/tests/sources/AbstractJSONDecoderCodecTest.kt b/coding/tests/sources/AbstractJSONDecoderCodecTest.kt
deleted file mode 100644
index 5e73a44..0000000
--- a/coding/tests/sources/AbstractJSONDecoderCodecTest.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package tests.coding
-
-import ch.tutteli.atrium.api.cc.en_GB.*
-import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
-import org.junit.jupiter.api.*
-
-
-internal object AbstractJSONDecoderCodecTest {
-
-	@Test
-	fun testEncoderCodecForClassReturnsNested() {
-		assert(OuterDecoderCodec.encoderCodecForClass(Unit::class)).toBe(InnerEncoderCodec)
-	}
-
-
-	private object InnerEncoderCodec : AbstractJSONEncoderCodec<Unit, JSONCodingContext>() {
-
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Unit) {}
-	}
-
-
-	private object OuterDecoderCodec : AbstractJSONDecoderCodec<String, JSONCodingContext>(
-		additionalProviders = listOf(InnerEncoderCodec)
-	) {
-
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<String>) =
-			""
-	}
-}
diff --git a/coding/tests/sources/AbstractJSONEncoderCodecTest.kt b/coding/tests/sources/AbstractJSONEncoderCodecTest.kt
deleted file mode 100644
index 46f6368..0000000
--- a/coding/tests/sources/AbstractJSONEncoderCodecTest.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package tests.coding
-
-import ch.tutteli.atrium.api.cc.en_GB.*
-import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
-import org.junit.jupiter.api.*
-
-
-internal object AbstractJSONEncoderCodecTest {
-
-	@Test
-	fun testDecoderCodecForClassReturnsNested() {
-		assert(OuterEncoderCodec.decoderCodecForType<Unit, JSONCodingContext>()).toBe(InnerDecoderCodec)
-	}
-
-
-	private object InnerDecoderCodec : AbstractJSONDecoderCodec<Unit, JSONCodingContext>() {
-
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Unit>) =
-			Unit
-	}
-
-
-	private object OuterEncoderCodec : AbstractJSONEncoderCodec<String, JSONCodingContext>(
-		additionalProviders = listOf(InnerDecoderCodec)
-	) {
-
-		override fun JSONEncoder<JSONCodingContext>.encode(value: String) {}
-	}
-}
diff --git a/coding/tests/sources/AbstractJsonDecoderCodecTest.kt b/coding/tests/sources/AbstractJsonDecoderCodecTest.kt
new file mode 100644
index 0000000..6ae83d8
--- /dev/null
+++ b/coding/tests/sources/AbstractJsonDecoderCodecTest.kt
@@ -0,0 +1,30 @@
+package tests.coding
+
+import ch.tutteli.atrium.api.cc.en_GB.*
+import ch.tutteli.atrium.verbs.*
+import io.fluidsonic.json.*
+import org.junit.jupiter.api.*
+
+
+internal object AbstractJsonDecoderCodecTest {
+
+	@Test
+	fun testEncoderCodecForClassReturnsNested() {
+		assert(OuterDecoderCodec.encoderCodecForClass(Unit::class)).toBe(InnerEncoderCodec)
+	}
+
+
+	private object InnerEncoderCodec : AbstractJsonEncoderCodec<Unit, JsonCodingContext>() {
+
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Unit) {}
+	}
+
+
+	private object OuterDecoderCodec : AbstractJsonDecoderCodec<String, JsonCodingContext>(
+		additionalProviders = listOf(InnerEncoderCodec)
+	) {
+
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<String>) =
+			""
+	}
+}
diff --git a/coding/tests/sources/AbstractJsonEncoderCodecTest.kt b/coding/tests/sources/AbstractJsonEncoderCodecTest.kt
new file mode 100644
index 0000000..0aaa448
--- /dev/null
+++ b/coding/tests/sources/AbstractJsonEncoderCodecTest.kt
@@ -0,0 +1,30 @@
+package tests.coding
+
+import ch.tutteli.atrium.api.cc.en_GB.*
+import ch.tutteli.atrium.verbs.*
+import io.fluidsonic.json.*
+import org.junit.jupiter.api.*
+
+
+internal object AbstractJsonEncoderCodecTest {
+
+	@Test
+	fun testDecoderCodecForClassReturnsNested() {
+		assert(OuterEncoderCodec.decoderCodecForType<Unit, JsonCodingContext>()).toBe(InnerDecoderCodec)
+	}
+
+
+	private object InnerDecoderCodec : AbstractJsonDecoderCodec<Unit, JsonCodingContext>() {
+
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Unit>) =
+			Unit
+	}
+
+
+	private object OuterEncoderCodec : AbstractJsonEncoderCodec<String, JsonCodingContext>(
+		additionalProviders = listOf(InnerDecoderCodec)
+	) {
+
+		override fun JsonEncoder<JsonCodingContext>.encode(value: String) {}
+	}
+}
diff --git a/coding/tests/sources/CompanionTest.kt b/coding/tests/sources/CompanionTest.kt
index 48296bd..2ab0421 100644
--- a/coding/tests/sources/CompanionTest.kt
+++ b/coding/tests/sources/CompanionTest.kt
@@ -1,6 +1,6 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
@@ -10,16 +10,16 @@ internal object CompanionTest {
 	fun testInitialization() {
 		// just make sure all companions initialize properly and we get more code coverage :)
 		listOf(
-			JSONCodingType.Companion,
-			JSONCodec.Companion,
-			JSONCodecProvider.Companion,
-			JSONCodingContext.Companion,
-			JSONDecoder.Companion,
-			JSONDecoderCodec.Companion,
-			JSONEncoder.Companion,
-			JSONEncoderCodec.Companion,
-			JSONCodingParser.Companion,
-			JSONCodingSerializer.Companion
+			JsonCodingType.Companion,
+			JsonCodec.Companion,
+			JsonCodecProvider.Companion,
+			JsonCodingContext.Companion,
+			JsonDecoder.Companion,
+			JsonDecoderCodec.Companion,
+			JsonEncoder.Companion,
+			JsonEncoderCodec.Companion,
+			JsonCodingParser.Companion,
+			JsonCodingSerializer.Companion
 		)
 	}
 }
diff --git a/coding/tests/sources/FixedCodecProviderTest.kt b/coding/tests/sources/FixedCodecProviderTest.kt
index 043d84c..e59b6c0 100644
--- a/coding/tests/sources/FixedCodecProviderTest.kt
+++ b/coding/tests/sources/FixedCodecProviderTest.kt
@@ -2,7 +2,7 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import kotlin.reflect.*
 
@@ -69,16 +69,16 @@ internal class FixedCodecProviderTest {
 		@Test
 		fun testMatchesArrayTypes() {
 			assert(
-				provider(ArrayJSONCodec)
+				provider(ArrayJsonCodec)
 					.encoderCodecForClass(Array<Any?>::class)
 			)
-				.toBe(ArrayJSONCodec)
+				.toBe(ArrayJsonCodec)
 
 			assert(
-				provider(ArrayJSONCodec)
+				provider(ArrayJsonCodec)
 					.encoderCodecForClass(Array<String>::class)
 			)
-				.toBe(ArrayJSONCodec)
+				.toBe(ArrayJsonCodec)
 		}
 
 
@@ -95,7 +95,7 @@ internal class FixedCodecProviderTest {
 		@Test
 		fun testMatchesPrimitiveArrayTypes() {
 			assert(
-				provider(ArrayJSONCodec)
+				provider(ArrayJsonCodec)
 					.encoderCodecForClass(IntArray::class as KClass<*>)
 			)
 				.toBe(null)
@@ -113,71 +113,71 @@ internal class FixedCodecProviderTest {
 	}
 
 
-	private fun provider(vararg codecs: JSONDecoderCodec<*, FixedCodecProviderTest.Context>) =
+	private fun provider(vararg codecs: JsonDecoderCodec<*, FixedCodecProviderTest.Context>) =
 		FixedCodecProvider(codecs.toList())
 
 
-	private fun provider(vararg codecs: JSONEncoderCodec<*, FixedCodecProviderTest.Context>) =
+	private fun provider(vararg codecs: JsonEncoderCodec<*, FixedCodecProviderTest.Context>) =
 		FixedCodecProvider(codecs.toList())
 
 
 	interface Parent
 	object Child : Parent
-	object Context : JSONCodingContext
+	object Context : JsonCodingContext
 	interface Unrelated
 
 
-	object ChildDecoderCodec : JSONDecoderCodec<Child, Context> {
+	object ChildDecoderCodec : JsonDecoderCodec<Child, Context> {
 
-		override fun JSONDecoder<Context>.decode(valueType: JSONCodingType<Child>) = error("dummy")
+		override fun JsonDecoder<Context>.decode(valueType: JsonCodingType<Child>) = error("dummy")
 
 		override val decodableType = jsonCodingType<Child>()
 	}
 
 
-	object ChildDecoderCodec2 : JSONDecoderCodec<Child, Context> {
+	object ChildDecoderCodec2 : JsonDecoderCodec<Child, Context> {
 
-		override fun JSONDecoder<Context>.decode(valueType: JSONCodingType<Child>) = error("dummy")
+		override fun JsonDecoder<Context>.decode(valueType: JsonCodingType<Child>) = error("dummy")
 
 		override val decodableType = jsonCodingType<Child>()
 	}
 
 
-	object ChildEncoderCodec : JSONEncoderCodec<Child, Context> {
+	object ChildEncoderCodec : JsonEncoderCodec<Child, Context> {
 
-		override fun JSONEncoder<Context>.encode(value: Child) = error("dummy")
+		override fun JsonEncoder<Context>.encode(value: Child) = error("dummy")
 
 		override val encodableClass = Child::class
 	}
 
 
-	object ParentDecoderCodec : JSONDecoderCodec<Parent, Context> {
+	object ParentDecoderCodec : JsonDecoderCodec<Parent, Context> {
 
-		override fun JSONDecoder<Context>.decode(valueType: JSONCodingType<Parent>) = error("dummy")
+		override fun JsonDecoder<Context>.decode(valueType: JsonCodingType<Parent>) = error("dummy")
 
 		override val decodableType = jsonCodingType<Parent>()
 	}
 
 
-	object ParentEncoderCodec : JSONEncoderCodec<Parent, Context> {
+	object ParentEncoderCodec : JsonEncoderCodec<Parent, Context> {
 
-		override fun JSONEncoder<Context>.encode(value: Parent) = error("dummy")
+		override fun JsonEncoder<Context>.encode(value: Parent) = error("dummy")
 
 		override val encodableClass = Parent::class
 	}
 
 
-	object UnrelatedDecoderCodec : JSONDecoderCodec<Unrelated, Context> {
+	object UnrelatedDecoderCodec : JsonDecoderCodec<Unrelated, Context> {
 
-		override fun JSONDecoder<Context>.decode(valueType: JSONCodingType<Unrelated>) = error("dummy")
+		override fun JsonDecoder<Context>.decode(valueType: JsonCodingType<Unrelated>) = error("dummy")
 
 		override val decodableType = jsonCodingType<Unrelated>()
 	}
 
 
-	object UnrelatedEncoderCodec : JSONEncoderCodec<Unrelated, Context> {
+	object UnrelatedEncoderCodec : JsonEncoderCodec<Unrelated, Context> {
 
-		override fun JSONEncoder<Context>.encode(value: Unrelated) = error("dummy")
+		override fun JsonEncoder<Context>.encode(value: Unrelated) = error("dummy")
 
 		override val encodableClass = Unrelated::class
 	}
diff --git a/coding/tests/sources/JSONCodingParserTest.kt b/coding/tests/sources/JsonCodingParserTest.kt
similarity index 85%
rename from coding/tests/sources/JSONCodingParserTest.kt
rename to coding/tests/sources/JsonCodingParserTest.kt
index d0f1c78..be64b2b 100644
--- a/coding/tests/sources/JSONCodingParserTest.kt
+++ b/coding/tests/sources/JsonCodingParserTest.kt
@@ -2,25 +2,25 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
 
-internal object JSONCodingParserTest {
+internal object JsonCodingParserTest {
 
 	@Test
 	fun testBuilder() {
-		JSONCodingParser.builder()
-			.decodingWith(BooleanJSONCodec)
+		JsonCodingParser.builder()
+			.decodingWith(BooleanJsonCodec)
 			.build()
 			.apply {
 				// TODO check correct context
 				assert(parseValue(StringReader("true"))).toBe(true)
 			}
 
-		JSONCodingParser.builder()
-			.decodingWith(listOf(BooleanJSONCodec))
+		JsonCodingParser.builder()
+			.decodingWith(listOf(BooleanJsonCodec))
 			.build()
 			.apply {
 				// TODO check correct context
@@ -29,7 +29,7 @@ internal object JSONCodingParserTest {
 
 		val testContext = TestCoderContext()
 
-		JSONCodingParser.builder(testContext)
+		JsonCodingParser.builder(testContext)
 			.decodingWith()
 			.build()
 			.apply {
@@ -42,14 +42,14 @@ internal object JSONCodingParserTest {
 	@Test
 	fun testBuilderWithDifferentBaseCodecs() {
 		try {
-			JSONCodingParser.builder()
+			JsonCodingParser.builder()
 				.decodingWith(base = null)
 				.build()
 				.parseValueOfType<List<*>>("[]")
 
-			throw AssertionError("JSONCodingParser without any codec provided unexpectedly uses codecs")
+			throw AssertionError("JsonCodingParser without any codec provided unexpectedly uses codecs")
 		}
-		catch (e: JSONException) {
+		catch (e: JsonException) {
 			// good
 		}
 	}
@@ -57,7 +57,7 @@ internal object JSONCodingParserTest {
 
 	@Test
 	fun testDefault() {
-		anyData.testDecoding(JSONCodingParser.default::parseValue)
+		anyData.testDecoding(JsonCodingParser.default::parseValue)
 	}
 
 
@@ -135,26 +135,26 @@ internal object JSONCodingParserTest {
 
 	private inline fun <reified Value : Any> testParseMethod(
 		expectedValue: Value?,
-		testBody: JSONCodingParser<*>.(type: JSONCodingType<Value>) -> Value?
+		testBody: JsonCodingParser<*>.(type: JsonCodingType<Value>) -> Value?
 	) {
 		val expectedType = jsonCodingType<Value>()
 
-		val parser = object : JSONCodingParser<JSONCodingContext> {
+		val parser = object : JsonCodingParser<JsonCodingContext> {
 
-			override fun createDecoder(source: JSONReader) =
+			override fun createDecoder(source: JsonReader) =
 				error("not called")
 
 
-			override fun <Value : Any> parseValueOfType(source: JSONReader, valueType: JSONCodingType<Value>, withTermination: Boolean): Value {
-				assert(valueType as JSONCodingType<*>).toBe(expectedType)
+			override fun <Value : Any> parseValueOfType(source: JsonReader, valueType: JsonCodingType<Value>, withTermination: Boolean): Value {
+				assert(valueType as JsonCodingType<*>).toBe(expectedType)
 
 				@Suppress("UNCHECKED_CAST")
 				return expectedValue as Value
 			}
 
 
-			override fun <Value : Any> parseValueOfTypeOrNull(source: JSONReader, valueType: JSONCodingType<Value>, withTermination: Boolean): Value? {
-				assert(valueType as JSONCodingType<*>).toBe(expectedType)
+			override fun <Value : Any> parseValueOfTypeOrNull(source: JsonReader, valueType: JsonCodingType<Value>, withTermination: Boolean): Value? {
+				assert(valueType as JsonCodingType<*>).toBe(expectedType)
 
 				@Suppress("UNCHECKED_CAST")
 				return expectedValue as Value?
diff --git a/coding/tests/sources/JSONCodingSerializerTest.kt b/coding/tests/sources/JsonCodingSerializerTest.kt
similarity index 62%
rename from coding/tests/sources/JSONCodingSerializerTest.kt
rename to coding/tests/sources/JsonCodingSerializerTest.kt
index 451e53a..e3173df 100644
--- a/coding/tests/sources/JSONCodingSerializerTest.kt
+++ b/coding/tests/sources/JsonCodingSerializerTest.kt
@@ -2,24 +2,24 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
-internal object JSONCodingSerializerTest {
+internal object JsonCodingSerializerTest {
 
 	@Test
 	fun testBuilder() {
-		JSONCodingSerializer.builder()
-			.encodingWith(BooleanJSONCodec)
+		JsonCodingSerializer.builder()
+			.encodingWith(BooleanJsonCodec)
 			.build()
 			.apply {
 				// TODO check correct context
 				assert(serializeValue(true)).toBe("true")
 			}
 
-		JSONCodingSerializer.builder()
-			.encodingWith(listOf(BooleanJSONCodec))
+		JsonCodingSerializer.builder()
+			.encodingWith(listOf(BooleanJsonCodec))
 			.build()
 			.apply {
 				// TODO check correct context
@@ -28,7 +28,7 @@ internal object JSONCodingSerializerTest {
 
 		val testContext = TestCoderContext()
 
-		JSONCodingSerializer.builder(testContext)
+		JsonCodingSerializer.builder(testContext)
 			.encodingWith()
 			.build()
 			.apply {
@@ -41,14 +41,14 @@ internal object JSONCodingSerializerTest {
 	@Test
 	fun testBuilderWithDifferentBaseCodecs() {
 		try {
-			JSONCodingSerializer.builder()
+			JsonCodingSerializer.builder()
 				.encodingWith(base = null)
 				.build()
 				.serializeValue(emptyList<Any>())
 
-			throw AssertionError("JSONCodingSerializer without any codec provided unexpectedly uses codecs")
+			throw AssertionError("JsonCodingSerializer without any codec provided unexpectedly uses codecs")
 		}
-		catch (e: JSONException) {
+		catch (e: JsonException) {
 			// good
 		}
 	}
@@ -56,6 +56,6 @@ internal object JSONCodingSerializerTest {
 
 	@Test
 	fun testDefault() {
-		anyData.testEncoding(JSONCodingSerializer.default::serializeValue)
+		anyData.testEncoding(JsonCodingSerializer.default::serializeValue)
 	}
 }
diff --git a/coding/tests/sources/JSONCodingTypeTest.kt b/coding/tests/sources/JsonCodingTypeTest.kt
similarity index 92%
rename from coding/tests/sources/JSONCodingTypeTest.kt
rename to coding/tests/sources/JsonCodingTypeTest.kt
index 44044bd..e0b8755 100644
--- a/coding/tests/sources/JSONCodingTypeTest.kt
+++ b/coding/tests/sources/JsonCodingTypeTest.kt
@@ -2,11 +2,11 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
-internal object JSONCodingTypeTest {
+internal object JsonCodingTypeTest {
 
 	@Test
 	fun testGenericTypeParametersWithMultipleUpperBounds() {
diff --git a/coding/tests/sources/JSONDecoderTest.kt b/coding/tests/sources/JsonDecoderTest.kt
similarity index 80%
rename from coding/tests/sources/JSONDecoderTest.kt
rename to coding/tests/sources/JsonDecoderTest.kt
index 2d1dc31..57bb5c6 100644
--- a/coding/tests/sources/JSONDecoderTest.kt
+++ b/coding/tests/sources/JsonDecoderTest.kt
@@ -2,38 +2,38 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
 
-internal object JSONDecoderTest {
+internal object JsonDecoderTest {
 
 	@Test
 	fun testBuilder() {
-		JSONDecoder.builder()
-			.codecs(BooleanJSONCodec)
+		JsonDecoder.builder()
+			.codecs(BooleanJsonCodec)
 			.source("true")
 			.build()
 			.apply {
-				assert(context).toBe(JSONCodingContext.empty)
+				assert(context).toBe(JsonCodingContext.empty)
 				assert(readBoolean()).toBe(true)
 			}
 
-		JSONDecoder.builder()
-			.codecs(listOf(BooleanJSONCodec))
+		JsonDecoder.builder()
+			.codecs(listOf(BooleanJsonCodec))
 			.source(StringReader("true"))
 			.build()
 			.apply {
-				assert(context).toBe(JSONCodingContext.empty)
+				assert(context).toBe(JsonCodingContext.empty)
 				assert(readBoolean()).toBe(true)
 			}
 
 		val testContext = TestCoderContext()
 
-		JSONDecoder.builder(testContext)
+		JsonDecoder.builder(testContext)
 			.codecs()
-			.source(JSONReader.build(StringReader("true")))
+			.source(JsonReader.build(StringReader("true")))
 			.build()
 			.apply {
 				assert(context).toBe(testContext)
@@ -93,18 +93,18 @@ internal object JSONDecoderTest {
 
 	private inline fun <reified Value : Any> testReadMethod(
 		expectedValue: Value?,
-		testBody: JSONDecoder<JSONCodingContext>.(type: JSONCodingType<Value>) -> Value?
+		testBody: JsonDecoder<JsonCodingContext>.(type: JsonCodingType<Value>) -> Value?
 	) {
 		val expectedType = jsonCodingType<Value>()
 
-		val decoder = object : JSONDecoder<JSONCodingContext>, JSONReader by DummyJSONReader() {
+		val decoder = object : JsonDecoder<JsonCodingContext>, JsonReader by DummyJsonReader() {
 
-			override val context: JSONCodingContext
+			override val context: JsonCodingContext
 				get() = error("")
 
 
-			override val nextToken: JSONToken?
-				get() = if (expectedValue == null) JSONToken.nullValue else JSONToken.stringValue
+			override val nextToken: JsonToken?
+				get() = if (expectedValue == null) JsonToken.nullValue else JsonToken.stringValue
 
 
 			override fun readNull(): Nothing? =
@@ -112,11 +112,11 @@ internal object JSONDecoderTest {
 
 
 			override fun readValue() =
-				super<JSONDecoder>.readValue()
+				super<JsonDecoder>.readValue()
 
 
-			override fun <Value : Any> readValueOfType(valueType: JSONCodingType<Value>): Value {
-				assert((valueType as JSONCodingType<*>)).toBe(expectedType)
+			override fun <Value : Any> readValueOfType(valueType: JsonCodingType<Value>): Value {
+				assert((valueType as JsonCodingType<*>)).toBe(expectedType)
 
 				@Suppress("UNCHECKED_CAST")
 				return expectedValue as Value
diff --git a/coding/tests/sources/JSONEncoderTest.kt b/coding/tests/sources/JsonEncoderTest.kt
similarity index 69%
rename from coding/tests/sources/JSONEncoderTest.kt
rename to coding/tests/sources/JsonEncoderTest.kt
index fe44c15..a08c350 100644
--- a/coding/tests/sources/JSONEncoderTest.kt
+++ b/coding/tests/sources/JsonEncoderTest.kt
@@ -2,34 +2,34 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
 
-internal object JSONEncoderTest {
+internal object JsonEncoderTest {
 
 	@Test
 	fun testBuilder() {
 		StringWriter().let { writer ->
-			JSONEncoder.builder()
-				.codecs(BooleanJSONCodec)
+			JsonEncoder.builder()
+				.codecs(BooleanJsonCodec)
 				.destination(writer)
 				.build()
 				.apply {
-					assert(context).toBe(JSONCodingContext.empty)
+					assert(context).toBe(JsonCodingContext.empty)
 					writeBoolean(true)
 					assert(writer.toString()).toBe("true")
 				}
 		}
 
 		StringWriter().let { writer ->
-			JSONEncoder.builder()
-				.codecs(listOf(BooleanJSONCodec))
+			JsonEncoder.builder()
+				.codecs(listOf(BooleanJsonCodec))
 				.destination(writer)
 				.build()
 				.apply {
-					assert(context).toBe(JSONCodingContext.empty)
+					assert(context).toBe(JsonCodingContext.empty)
 					writeBoolean(true)
 					assert(writer.toString()).toBe("true")
 				}
@@ -38,9 +38,9 @@ internal object JSONEncoderTest {
 		val testContext = TestCoderContext()
 
 		StringWriter().let { writer ->
-			JSONEncoder.builder(testContext)
+			JsonEncoder.builder(testContext)
 				.codecs()
-				.destination(JSONWriter.build(writer))
+				.destination(JsonWriter.build(writer))
 				.build()
 				.apply {
 					assert(context).toBe(testContext)
@@ -50,7 +50,7 @@ internal object JSONEncoderTest {
 		}
 
 		StringWriter().let { writer ->
-			JSONEncoder.builder(testContext)
+			JsonEncoder.builder(testContext)
 				.codecs()
 				.destination(writer)
 				.build()
diff --git a/coding/tests/sources/JSONTestSuite.kt b/coding/tests/sources/JsonTestSuite.kt
similarity index 84%
rename from coding/tests/sources/JSONTestSuite.kt
rename to coding/tests/sources/JsonTestSuite.kt
index 2ab8a0e..16561e8 100644
--- a/coding/tests/sources/JSONTestSuite.kt
+++ b/coding/tests/sources/JsonTestSuite.kt
@@ -1,16 +1,16 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
 
 @DisplayName("JSON Test Suite (https://github.com/nst/JSONTestSuite)")
-internal object JSONTestSuite {
+internal object JsonTestSuite {
 
 	private val environments = listOf(
-		TestEnvironment("Default Parser", JSONCodingParser.default, parserIsRecursive = true),
-		TestEnvironment("Non-recursive Parser", JSONCodingParser.nonRecursive, parserIsRecursive = false)
+		TestEnvironment("Default Parser", JsonCodingParser.default, parserIsRecursive = true),
+		TestEnvironment("Non-recursive Parser", JsonCodingParser.nonRecursive, parserIsRecursive = false)
 	)
 
 
@@ -25,14 +25,14 @@ internal object JSONTestSuite {
 			val result = try {
 				environment.parser.parseValueOrNull(FileReader(file))
 			}
-			catch (e: JSONException) {
+			catch (e: JsonException) {
 				e
 			}
 			catch (e: StackOverflowError) {
 				throw AssertionError("Stack overflow in '${file.name}'")
 			}
 
-			val actualBehavior = if (result is JSONException) Behavior.rejected else Behavior.accepted
+			val actualBehavior = if (result is JsonException) Behavior.rejected else Behavior.accepted
 			val expectedBehavior = when (file.name.substringBefore('_')) {
 				"i" -> null
 				"n" -> Behavior.rejected
@@ -75,7 +75,7 @@ internal object JSONTestSuite {
 
 	private class TestEnvironment(
 		val name: String,
-		val parser: JSONCodingParser<*>,
+		val parser: JsonCodingParser<*>,
 		val parserIsRecursive: Boolean
 	)
 }
diff --git a/coding/tests/sources/KClassTest.kt b/coding/tests/sources/KClassTest.kt
index fcc840e..18d77d4 100644
--- a/coding/tests/sources/KClassTest.kt
+++ b/coding/tests/sources/KClassTest.kt
@@ -2,7 +2,7 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
diff --git a/coding/tests/sources/StandardCodingParserRejectTest.kt b/coding/tests/sources/StandardCodingParserRejectTest.kt
index ba5b6cc..93aa399 100644
--- a/coding/tests/sources/StandardCodingParserRejectTest.kt
+++ b/coding/tests/sources/StandardCodingParserRejectTest.kt
@@ -1,6 +1,6 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
@@ -206,25 +206,25 @@ internal object StandardCodingParserRejectTest {
 	}
 
 
-	private inline fun shouldFailWithJSONException(block: () -> Unit) {
+	private inline fun shouldFailWithJsonException(block: () -> Unit) {
 		try {
 			block()
-			throw AssertionError("should fail with a JSONException")
+			throw AssertionError("should fail with a JsonException")
 		}
-		catch (e: JSONException) {
+		catch (e: JsonException) {
 			// good
 		}
 	}
 
 
 	private fun failToParse(string: String) {
-		val parser = StandardCodingParser(JSONCodingContext.empty) { source, context ->
-			JSONDecoder.builder(context)
+		val parser = StandardCodingParser(JsonCodingContext.empty) { source, context ->
+			JsonDecoder.builder(context)
 				.codecs()
 				.source(source)
 				.build()
 		}
 
-		shouldFailWithJSONException { parser.parseValue(string) }
+		shouldFailWithJsonException { parser.parseValue(string) }
 	}
 }
diff --git a/coding/tests/sources/StandardCodingSerializerRejectTest.kt b/coding/tests/sources/StandardCodingSerializerRejectTest.kt
index a8fbc27..f3159c0 100644
--- a/coding/tests/sources/StandardCodingSerializerRejectTest.kt
+++ b/coding/tests/sources/StandardCodingSerializerRejectTest.kt
@@ -1,6 +1,6 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
@@ -36,8 +36,8 @@ internal object StandardCodingSerializerRejectTest {
 
 
 	private fun failToSerialize(value: Any?) {
-		val serializer = StandardCodingSerializer(JSONCodingContext.empty) { destination, context ->
-			JSONEncoder.builder(context)
+		val serializer = StandardCodingSerializer(JsonCodingContext.empty) { destination, context ->
+			JsonEncoder.builder(context)
 				.codecs()
 				.destination(destination)
 				.build()
@@ -45,9 +45,9 @@ internal object StandardCodingSerializerRejectTest {
 
 		try {
 			serializer.serializeValue(value)
-			throw AssertionError("should fail with a JSONException")
+			throw AssertionError("should fail with a JsonException")
 		}
-		catch (e: JSONException) {
+		catch (e: JsonException) {
 			// good
 		}
 	}
diff --git a/coding/tests/sources/StandardDecoderTest.kt b/coding/tests/sources/StandardDecoderTest.kt
index bf0c05d..3fb6ea0 100644
--- a/coding/tests/sources/StandardDecoderTest.kt
+++ b/coding/tests/sources/StandardDecoderTest.kt
@@ -2,7 +2,7 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
@@ -66,12 +66,12 @@ internal object StandardDecoderTest {
 
 		val output = decode(
 			input = input,
-			codecProvider = JSONCodecProvider(
+			codecProvider = JsonCodecProvider(
 				JaegerCodec,
 				KaijuCodec,
 				YearMonthDayCodec,
 				UniverseCodec,
-				JSONCodecProvider.basic
+				JsonCodecProvider.basic
 			)
 		) { readValueOfType<Universe>() }
 
@@ -88,7 +88,7 @@ internal object StandardDecoderTest {
 				readValueOfType<Unsupported>()
 				throw AssertionError("an exception was expected")
 			}
-			catch (e: JSONException) {
+			catch (e: JsonException) {
 				// good
 			}
 		}
@@ -101,13 +101,13 @@ internal object StandardDecoderTest {
 
 		decode(
 			input = "\"test\"",
-			codecProvider = JSONCodecProvider(ContextCheckingTestCodec(context)),
+			codecProvider = JsonCodecProvider(ContextCheckingTestCodec(context)),
 			context = context
 		) { readValueOfType<String>() }
 
 		decode(
 			input = "\"test\"",
-			codecProvider = JSONCodecProvider(ContextCheckingTestDecoderCodec(context)),
+			codecProvider = JsonCodecProvider(ContextCheckingTestDecoderCodec(context)),
 			context = context
 		) { readValueOfType<String>() }
 	}
@@ -115,13 +115,13 @@ internal object StandardDecoderTest {
 
 	private inline fun <ReturnValue> decode(
 		input: String,
-		codecProvider: JSONCodecProvider<TestCoderContext> = JSONCodecProvider(),
+		codecProvider: JsonCodecProvider<TestCoderContext> = JsonCodecProvider(),
 		context: TestCoderContext = TestCoderContext(),
-		block: JSONDecoder<TestCoderContext>.() -> ReturnValue
+		block: JsonDecoder<TestCoderContext>.() -> ReturnValue
 	) =
 		StandardDecoder(
 			codecProvider = codecProvider,
 			context = context,
-			source = JSONReader.build(input)
+			source = JsonReader.build(input)
 		).use(withTermination = false) { it.block() }
 }
diff --git a/coding/tests/sources/StandardEncoderTest.kt b/coding/tests/sources/StandardEncoderTest.kt
index c8b9592..a1e94fc 100644
--- a/coding/tests/sources/StandardEncoderTest.kt
+++ b/coding/tests/sources/StandardEncoderTest.kt
@@ -2,7 +2,7 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 import java.io.*
 
@@ -41,12 +41,12 @@ internal object StandardEncoderTest {
 		val expectedOutput = """{"jaegers":[{"height":76.2,"launchDate":"2019-11-02","mark":5,"name":"Striker Eureka","origin":"Australia","status":"destroyed","weight":1850.0}],"kaijus":[{"breachDate":"2025-01-12","category":5,"height":181.7,"name":"Slattern","origin":"Anteverse","status":"deceased","weight":6750.0}]}"""
 
 		val output = encode(
-			codecProvider = JSONCodecProvider(
+			codecProvider = JsonCodecProvider(
 				JaegerCodec,
 				KaijuCodec,
 				YearMonthDayCodec,
 				UniverseCodec,
-				JSONCodecProvider.basic
+				JsonCodecProvider.basic
 			)
 		) {
 			writeValue(input)
@@ -63,7 +63,7 @@ internal object StandardEncoderTest {
 				writeValue(object {})
 				throw AssertionError("an exception was expected")
 			}
-			catch (e: JSONException) {
+			catch (e: JsonException) {
 				// good
 			}
 		}
@@ -75,28 +75,28 @@ internal object StandardEncoderTest {
 		val context = TestCoderContext()
 
 		encode(
-			codecProvider = JSONCodecProvider(ContextCheckingTestCodec(context)),
+			codecProvider = JsonCodecProvider(ContextCheckingTestCodec(context)),
 			context = context
 		) { writeValue("test") }
 
 		encode(
-			codecProvider = JSONCodecProvider(ContextCheckingTestEncoderCodec(context)),
+			codecProvider = JsonCodecProvider(ContextCheckingTestEncoderCodec(context)),
 			context = context
 		) { writeValue("test") }
 	}
 
 
 	private inline fun encode(
-		codecProvider: JSONCodecProvider<TestCoderContext> = JSONCodecProvider(),
+		codecProvider: JsonCodecProvider<TestCoderContext> = JsonCodecProvider(),
 		context: TestCoderContext = TestCoderContext(),
-		block: JSONEncoder<TestCoderContext>.() -> Unit
+		block: JsonEncoder<TestCoderContext>.() -> Unit
 	): String {
 		val writer = StringWriter()
 
 		StandardEncoder(
 			codecProvider = codecProvider,
 			context = context,
-			destination = JSONWriter.build(writer)
+			destination = JsonWriter.build(writer)
 		)
 			.use(withTermination = false) {
 				it.block()
diff --git a/coding/tests/sources/codecs/BasicCodecsTest.kt b/coding/tests/sources/codecs/BasicCodecsTest.kt
index 8b7848f..b6cdced 100644
--- a/coding/tests/sources/codecs/BasicCodecsTest.kt
+++ b/coding/tests/sources/codecs/BasicCodecsTest.kt
@@ -2,7 +2,7 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
@@ -10,48 +10,48 @@ import org.junit.jupiter.api.*
 internal object BasicCodecsTest {
 
 	private val cases = listOf(
-		TestCase("Any", AnyJSONTestDecoderCodec, anyData),
-		TestCase("Array", ArrayJSONTestEncoderCodec, arrayData),
-		TestCase("Array (non-recursive)", ArrayJSONTestEncoderCodec.NonRecursive, arrayData),
-		TestCase("Boolean", BooleanJSONCodec, booleanData),
-		TestCase("BooleanArray", BooleanArrayJSONCodec, booleanArrayData),
-		TestCase("Byte", ByteJSONCodec, byteData),
-		TestCase("ByteArray", ByteArrayJSONCodec, byteArrayData),
-		TestCase("Char", CharJSONCodec, charData),
-		TestCase("CharArray", CharArrayJSONCodec, charArrayData),
-		TestCase("Collection", CollectionJSONTestCodec, collectionData),
-		TestCase("Collection (non-recursive)", CollectionJSONTestCodec.NonRecursive, collectionData),
-		TestCase("Double", DoubleJSONCodec, doubleData),
-		TestCase("DoubleArray", DoubleArrayJSONCodec, doubleArrayData),
-		TestCase("Float", FloatJSONCodec, floatData),
-		TestCase("FloatArray", FloatArrayJSONCodec, floatArrayData),
-		TestCase("Int", IntJSONCodec, intData),
-		TestCase("IntArray", IntArrayJSONCodec, intArrayData),
-		TestCase("Iterable", IterableJSONEncoderTestCodec, iterableData),
-		TestCase("Iterable (non-recursive)", IterableJSONEncoderTestCodec.NonRecursive, iterableData),
-		TestCase("List", ListJSONTestDecoderCodec, listData),
-		TestCase("List (non-recursive)", ListJSONTestDecoderCodec.NonRecursive, listData),
-		TestCase("Long", LongJSONCodec, longData),
-		TestCase("LongArray", LongArrayJSONCodec, longArrayData),
-		TestCase("Map", MapJSONTestCodec, mapData),
-		TestCase("Map (non-recursive)", MapJSONTestCodec.NonRecursive, mapData),
-		TestCase("Map (non-String keys)", MapJSONTestCodec, mapDataWithNonStringKeys),
-		TestCase("Number", NumberJSONCodec, numberData),
-		TestCase("Sequence", SequenceJSONTestCodec, sequenceData),
-		TestCase("Sequence (non-recursive)", SequenceJSONTestCodec.NonRecursive, sequenceData),
-		TestCase("Set", SetJSONTestDecoderCodec, setData),
-		TestCase("Set (non-recursive)", SetJSONTestDecoderCodec.NonRecursive, setData),
-		TestCase("Short", ShortJSONCodec, shortData),
-		TestCase("ShortArray", ShortArrayJSONCodec, shortArrayData),
-		TestCase("String", StringJSONCodec, stringData)
+		TestCase("Any", AnyJsonTestDecoderCodec, anyData),
+		TestCase("Array", ArrayJsonTestEncoderCodec, arrayData),
+		TestCase("Array (non-recursive)", ArrayJsonTestEncoderCodec.NonRecursive, arrayData),
+		TestCase("Boolean", BooleanJsonCodec, booleanData),
+		TestCase("BooleanArray", BooleanArrayJsonCodec, booleanArrayData),
+		TestCase("Byte", ByteJsonCodec, byteData),
+		TestCase("ByteArray", ByteArrayJsonCodec, byteArrayData),
+		TestCase("Char", CharJsonCodec, charData),
+		TestCase("CharArray", CharArrayJsonCodec, charArrayData),
+		TestCase("Collection", CollectionJsonTestCodec, collectionData),
+		TestCase("Collection (non-recursive)", CollectionJsonTestCodec.NonRecursive, collectionData),
+		TestCase("Double", DoubleJsonCodec, doubleData),
+		TestCase("DoubleArray", DoubleArrayJsonCodec, doubleArrayData),
+		TestCase("Float", FloatJsonCodec, floatData),
+		TestCase("FloatArray", FloatArrayJsonCodec, floatArrayData),
+		TestCase("Int", IntJsonCodec, intData),
+		TestCase("IntArray", IntArrayJsonCodec, intArrayData),
+		TestCase("Iterable", IterableJsonEncoderTestCodec, iterableData),
+		TestCase("Iterable (non-recursive)", IterableJsonEncoderTestCodec.NonRecursive, iterableData),
+		TestCase("List", ListJsonTestDecoderCodec, listData),
+		TestCase("List (non-recursive)", ListJsonTestDecoderCodec.NonRecursive, listData),
+		TestCase("Long", LongJsonCodec, longData),
+		TestCase("LongArray", LongArrayJsonCodec, longArrayData),
+		TestCase("Map", MapJsonTestCodec, mapData),
+		TestCase("Map (non-recursive)", MapJsonTestCodec.NonRecursive, mapData),
+		TestCase("Map (non-String keys)", MapJsonTestCodec, mapDataWithNonStringKeys),
+		TestCase("Number", NumberJsonCodec, numberData),
+		TestCase("Sequence", SequenceJsonTestCodec, sequenceData),
+		TestCase("Sequence (non-recursive)", SequenceJsonTestCodec.NonRecursive, sequenceData),
+		TestCase("Set", SetJsonTestDecoderCodec, setData),
+		TestCase("Set (non-recursive)", SetJsonTestDecoderCodec.NonRecursive, setData),
+		TestCase("Short", ShortJsonCodec, shortData),
+		TestCase("ShortArray", ShortArrayJsonCodec, shortArrayData),
+		TestCase("String", StringJsonCodec, stringData)
 	)
 
 
 	private fun buildTests(case: TestCase<*>) = listOfNotNull(
-		(case.codec as? JSONDecoderCodec<Any, JSONCodingContext>)?.let { decoderCodec ->
+		(case.codec as? JsonDecoderCodec<Any, JsonCodingContext>)?.let { decoderCodec ->
 			DynamicTest.dynamicTest("is decodable") {
 				try {
-					case.data.testDecoding { decoderCodec.parse(it, type = case.type as JSONCodingType<Any>) }
+					case.data.testDecoding { decoderCodec.parse(it, type = case.type as JsonCodingType<Any>) }
 				}
 				catch (e: Throwable) {
 					throw AssertionError("${decoderCodec::class.simpleName} (for ${case.type}): ${e.message}").apply {
@@ -61,7 +61,7 @@ internal object BasicCodecsTest {
 			}
 		},
 
-		(case.codec as? JSONEncoderCodec<Any, JSONCodingContext>)?.let { encoderCodec ->
+		(case.codec as? JsonEncoderCodec<Any, JsonCodingContext>)?.let { encoderCodec ->
 			DynamicTest.dynamicTest("is encodable") {
 				try {
 					case.data.testEncoding { encoderCodec.serialize(it) }
@@ -89,7 +89,7 @@ internal object BasicCodecsTest {
 	@Test
 	fun testMaintainsMapEntryOrder() {
 		assert(
-			MapJSONTestCodec.parse("""{ "3": 3, "1": 1, "2": 2, "0": 0 }""", jsonCodingType())
+			MapJsonTestCodec.parse("""{ "3": 3, "1": 1, "2": 2, "0": 0 }""", jsonCodingType())
 				.entries.toList()
 		)
 			.toBe(mapOf("3" to 3, "1" to 1, "2" to 2, "0" to 0).entries.toList())
@@ -98,16 +98,16 @@ internal object BasicCodecsTest {
 
 	private class TestCase<Value : Any> private constructor(
 		val name: String,
-		val codec: JSONCodecProvider<JSONCodingContext>,
+		val codec: JsonCodecProvider<JsonCodingContext>,
 		val data: TestData<Value>,
-		val type: JSONCodingType<Value>
+		val type: JsonCodingType<Value>
 	) {
 
 		companion object {
 
 			inline operator fun <reified Value : Any> invoke(
 				name: String,
-				codec: JSONCodecProvider<JSONCodingContext>,
+				codec: JsonCodecProvider<JsonCodingContext>,
 				data: TestData<Value>
 			) =
 				TestCase(name = name, codec = codec, data = data, type = jsonCodingType())
diff --git a/coding/tests/sources/codecs/CharRangeJSONCodecTest.kt b/coding/tests/sources/codecs/CharRangeJsonCodecTest.kt
similarity index 70%
rename from coding/tests/sources/codecs/CharRangeJSONCodecTest.kt
rename to coding/tests/sources/codecs/CharRangeJsonCodecTest.kt
index 5462777..c904f44 100644
--- a/coding/tests/sources/codecs/CharRangeJSONCodecTest.kt
+++ b/coding/tests/sources/codecs/CharRangeJsonCodecTest.kt
@@ -2,23 +2,23 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
 @Suppress("UNCHECKED_CAST")
-internal object CharRangeJSONCodecTest {
+internal object CharRangeJsonCodecTest {
 
-	val codecs = JSONCodecProvider(
-		CharJSONCodec,
-		CharRangeJSONCodec
+	val codecs = JsonCodecProvider(
+		CharJsonCodec,
+		CharRangeJsonCodec
 	)
 
-	val parser = JSONCodingParser.builder()
+	val parser = JsonCodingParser.builder()
 		.decodingWith(codecs, base = null)
 		.build()
 
-	val serializer = JSONCodingSerializer.builder()
+	val serializer = JsonCodingSerializer.builder()
 		.encodingWith(codecs, base = null)
 		.build()
 
diff --git a/coding/tests/sources/codecs/ClosedRangeJSONCodecTest.kt b/coding/tests/sources/codecs/ClosedRangeJsonCodecTest.kt
similarity index 86%
rename from coding/tests/sources/codecs/ClosedRangeJSONCodecTest.kt
rename to coding/tests/sources/codecs/ClosedRangeJsonCodecTest.kt
index 35a1244..b4fc82f 100644
--- a/coding/tests/sources/codecs/ClosedRangeJSONCodecTest.kt
+++ b/coding/tests/sources/codecs/ClosedRangeJsonCodecTest.kt
@@ -2,29 +2,29 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
 @Suppress("UNCHECKED_CAST")
-internal object ClosedRangeJSONCodecTest {
-
-	val codecs = JSONCodecProvider(
-		AnyJSONDecoderCodec,
-		CharJSONCodec,
-		ClosedRangeJSONCodec,
-		DoubleJSONCodec,
-		FloatJSONCodec,
-		IntJSONCodec,
-		LongJSONCodec,
-		StringJSONCodec
+internal object ClosedRangeJsonCodecTest {
+
+	val codecs = JsonCodecProvider(
+		AnyJsonDecoderCodec,
+		CharJsonCodec,
+		ClosedRangeJsonCodec,
+		DoubleJsonCodec,
+		FloatJsonCodec,
+		IntJsonCodec,
+		LongJsonCodec,
+		StringJsonCodec
 	)
 
-	val parser = JSONCodingParser.builder()
+	val parser = JsonCodingParser.builder()
 		.decodingWith(codecs, base = null)
 		.build()
 
-	val serializer = JSONCodingSerializer.builder()
+	val serializer = JsonCodingSerializer.builder()
 		.encodingWith(codecs, base = null)
 		.build()
 
diff --git a/coding/tests/sources/codecs/EnumJSONCodecProviderTest.kt b/coding/tests/sources/codecs/EnumJsonCodecProviderTest.kt
similarity index 68%
rename from coding/tests/sources/codecs/EnumJSONCodecProviderTest.kt
rename to coding/tests/sources/codecs/EnumJsonCodecProviderTest.kt
index c999bde..a59a0b2 100644
--- a/coding/tests/sources/codecs/EnumJSONCodecProviderTest.kt
+++ b/coding/tests/sources/codecs/EnumJsonCodecProviderTest.kt
@@ -2,17 +2,17 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
 @Suppress("UNCHECKED_CAST")
-internal object EnumJSONCodecProviderTest {
+internal object EnumJsonCodecProviderTest {
 
 	@Test
 	fun test() {
-		val provider = EnumJSONCodecProvider(transformation = EnumJSONTransformation.Ordinal)
-		val serializer = JSONCodingSerializer.builder().encodingWith(provider).build()
+		val provider = EnumJsonCodecProvider(transformation = EnumJsonTransformation.Ordinal)
+		val serializer = JsonCodingSerializer.builder().encodingWith(provider).build()
 
 		for (enumClass in listOf(Example1::class, Example2::class)) {
 			assert(serializer.serializeValue(enumClass.java.enumConstants.first())).toBe("0")
diff --git a/coding/tests/sources/codecs/EnumJSONCodecTest.kt b/coding/tests/sources/codecs/EnumJsonCodecTest.kt
similarity index 91%
rename from coding/tests/sources/codecs/EnumJSONCodecTest.kt
rename to coding/tests/sources/codecs/EnumJsonCodecTest.kt
index 3836492..46533f7 100644
--- a/coding/tests/sources/codecs/EnumJSONCodecTest.kt
+++ b/coding/tests/sources/codecs/EnumJsonCodecTest.kt
@@ -1,12 +1,12 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
-import com.github.fluidsonic.fluid.json.EnumJSONTransformation.*
+import io.fluidsonic.json.*
+import io.fluidsonic.json.EnumJsonTransformation.*
 import org.junit.jupiter.api.*
 
 
 @Suppress("UNCHECKED_CAST")
-internal object EnumJSONCodecTest {
+internal object EnumJsonCodecTest {
 
 	private val samplesByPropertyAndCase = mapOf(
 		"name" to mapOf(
@@ -21,7 +21,7 @@ internal object EnumJSONCodecTest {
 				"UPPER_SNAKE_CASE123",
 				"UPPERCASE123",
 				"UPPERCASE WORDS 123",
-				"0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JSONCodec@1_0"
+				"0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JsonCodec@1_0"
 			),
 			Case.lowerCamelCase to listOf(
 				"lowerCamelCase123",
@@ -166,7 +166,7 @@ internal object EnumJSONCodecTest {
 				"UPPER_SNAKE_CASE123.toString()",
 				"UPPERCASE123.toString()",
 				"UPPERCASE WORDS 123.toString()",
-				"0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JSONCodec/1.0.toString()"
+				"0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JsonCodec/1.0.toString()"
 			),
 			Case.lowerCamelCase to listOf(
 				"lowerCamelCase123ToString",
@@ -303,23 +303,23 @@ internal object EnumJSONCodecTest {
 
 
 	private fun enumCodec(property: String, case: Case? = null) =
-		EnumJSONCodec<Example>(transformation = when (property) {
-			"name" -> EnumJSONTransformation.Name(case = case)
-			"toString" -> EnumJSONTransformation.ToString(case = case)
+		EnumJsonCodec<Example>(transformation = when (property) {
+			"name" -> EnumJsonTransformation.Name(case = case)
+			"toString" -> EnumJsonTransformation.ToString(case = case)
 			else -> error("unknown property")
 		})
 
 
 	@Test
 	fun testOrdinal() {
-		val codec = EnumJSONCodec<Example>(transformation = EnumJSONTransformation.Ordinal)
+		val codec = EnumJsonCodec<Example>(transformation = EnumJsonTransformation.Ordinal)
 
-		val parser = JSONCodingParser
+		val parser = JsonCodingParser
 			.builder()
 			.decodingWith(codec)
 			.build()
 
-		val serializer = JSONCodingSerializer
+		val serializer = JsonCodingSerializer
 			.builder()
 			.encodingWith(codec)
 			.build()
@@ -340,22 +340,22 @@ internal object EnumJSONCodecTest {
 		}
 
 		for (expectedValue in Example.values()) {
-			val expectedJSON = serializer.serializeValue(expectedValue.ordinal)
+			val expectedJson = serializer.serializeValue(expectedValue.ordinal)
 
-			val actualJSON = serializer.serializeValue(expectedValue)
-			if (actualJSON != expectedJSON)
+			val actualJson = serializer.serializeValue(expectedValue)
+			if (actualJson != expectedJson)
 				fail(
 					message = "enum was not serialized correctly",
 					input = "Example.${expectedValue.kotlinIdentifier}",
-					expected = expectedJSON,
-					actual = actualJSON
+					expected = expectedJson,
+					actual = actualJson
 				)
 
-			val actualValue = parser.parseValueOfType<Example>(expectedJSON)
+			val actualValue = parser.parseValueOfType<Example>(expectedJson)
 			if (actualValue != expectedValue)
 				fail(
 					message = "enum was not parser correctly",
-					input = expectedJSON,
+					input = expectedJson,
 					expected = "Example.${expectedValue.kotlinIdentifier}",
 					actual = "Example.${actualValue.kotlinIdentifier}"
 				)
@@ -383,34 +383,34 @@ internal object EnumJSONCodecTest {
 					)
 				}
 
-				val parser = JSONCodingParser
+				val parser = JsonCodingParser
 					.builder()
 					.decodingWith(enumCodec(property = property, case = case))
 					.build()
 
-				val serializer = JSONCodingSerializer
+				val serializer = JsonCodingSerializer
 					.builder()
 					.encodingWith(enumCodec(property = property, case = case))
 					.build()
 
 				for ((ordinal, sample) in samples.withIndex()) {
 					val expectedValue = Example.values()[ordinal]
-					val expectedJSON = serializer.serializeValue(sample)
+					val expectedJson = serializer.serializeValue(sample)
 
-					val actualJSON = serializer.serializeValue(expectedValue)
-					if (actualJSON != expectedJSON)
+					val actualJson = serializer.serializeValue(expectedValue)
+					if (actualJson != expectedJson)
 						fail(
 							message = "enum was not serialized correctly",
 							input = "Example.${expectedValue.kotlinIdentifier}",
-							expected = expectedJSON,
-							actual = actualJSON
+							expected = expectedJson,
+							actual = actualJson
 						)
 
-					val actualValue = parser.parseValueOfType<Example>(expectedJSON)
+					val actualValue = parser.parseValueOfType<Example>(expectedJson)
 					if (actualValue != expectedValue)
 						fail(
 							message = "enum was not parsed correctly",
-							input = expectedJSON,
+							input = expectedJson,
 							expected = "Example.${expectedValue.kotlinIdentifier}",
 							actual = "Example.${actualValue.kotlinIdentifier}"
 						)
@@ -432,14 +432,14 @@ internal object EnumJSONCodecTest {
 		UPPER_SNAKE_CASE123,
 		UPPERCASE123,
 		`UPPERCASE WORDS 123`,
-		`0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JSONCodec@1_0`;
+		`0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JsonCodec@1_0`;
 
 
 		val kotlinIdentifier
 			get() = when (this) {
 				`lowercase words 123`,
 				`UPPERCASE WORDS 123`,
-				`0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JSONCodec@1_0` ->
+				`0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JsonCodec@1_0` ->
 					"`$name`"
 
 				else ->
@@ -458,8 +458,8 @@ internal object EnumJSONCodecTest {
 			UPPER_SNAKE_CASE123 -> "UPPER_SNAKE_CASE123.toString()"
 			UPPERCASE123 -> "UPPERCASE123.toString()"
 			`UPPERCASE WORDS 123` -> "UPPERCASE WORDS 123.toString()"
-			`0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JSONCodec@1_0` ->
-				"0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JSONCodec/1.0.toString()"
+			`0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JsonCodec@1_0` ->
+				"0 some spaces upperCase wtf snakes_are_coming_in 123 abc123 justHTML xml XML JsonCodec/1.0.toString()"
 		}
 	}
 }
diff --git a/coding/tests/sources/codecs/IntRangeJSONCodecTest.kt b/coding/tests/sources/codecs/IntRangeJsonCodecTest.kt
similarity index 69%
rename from coding/tests/sources/codecs/IntRangeJSONCodecTest.kt
rename to coding/tests/sources/codecs/IntRangeJsonCodecTest.kt
index 8ff7246..965af71 100644
--- a/coding/tests/sources/codecs/IntRangeJSONCodecTest.kt
+++ b/coding/tests/sources/codecs/IntRangeJsonCodecTest.kt
@@ -2,23 +2,23 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
 @Suppress("UNCHECKED_CAST")
-internal object IntRangeJSONCodecTest {
+internal object IntRangeJsonCodecTest {
 
-	val codecs = JSONCodecProvider(
-		IntJSONCodec,
-		IntRangeJSONCodec
+	val codecs = JsonCodecProvider(
+		IntJsonCodec,
+		IntRangeJsonCodec
 	)
 
-	val parser = JSONCodingParser.builder()
+	val parser = JsonCodingParser.builder()
 		.decodingWith(codecs, base = null)
 		.build()
 
-	val serializer = JSONCodingSerializer.builder()
+	val serializer = JsonCodingSerializer.builder()
 		.encodingWith(codecs, base = null)
 		.build()
 
diff --git a/coding/tests/sources/codecs/LongRangeJSONCodecTest.kt b/coding/tests/sources/codecs/LongRangeJsonCodecTest.kt
similarity index 69%
rename from coding/tests/sources/codecs/LongRangeJSONCodecTest.kt
rename to coding/tests/sources/codecs/LongRangeJsonCodecTest.kt
index d334dde..314933e 100644
--- a/coding/tests/sources/codecs/LongRangeJSONCodecTest.kt
+++ b/coding/tests/sources/codecs/LongRangeJsonCodecTest.kt
@@ -2,23 +2,23 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import org.junit.jupiter.api.*
 
 
 @Suppress("UNCHECKED_CAST")
-internal object LongRangeJSONCodecTest {
+internal object LongRangeJsonCodecTest {
 
-	val codecs = JSONCodecProvider(
-		LongJSONCodec,
-		LongRangeJSONCodec
+	val codecs = JsonCodecProvider(
+		LongJsonCodec,
+		LongRangeJsonCodec
 	)
 
-	val parser = JSONCodingParser.builder()
+	val parser = JsonCodingParser.builder()
 		.decodingWith(codecs, base = null)
 		.build()
 
-	val serializer = JSONCodingSerializer.builder()
+	val serializer = JsonCodingSerializer.builder()
 		.encodingWith(codecs, base = null)
 		.build()
 
diff --git a/coding/tests/sources/data/TestData.kt b/coding/tests/sources/data/TestData.kt
index 5392da7..7656e64 100644
--- a/coding/tests/sources/data/TestData.kt
+++ b/coding/tests/sources/data/TestData.kt
@@ -2,7 +2,7 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 internal class TestData<out Value : Any>(
@@ -44,7 +44,7 @@ internal class TestData<out Value : Any>(
 				encode(input)
 				throw AssertionError("Encoding succeeded but should have failed when encoding ${input::class}: $input")
 			}
-			catch (e: JSONException) {
+			catch (e: JsonException) {
 				// good
 			}
 	}
diff --git a/coding/tests/sources/dummys/DummyJSONReader.kt b/coding/tests/sources/dummys/DummyJsonReader.kt
similarity index 66%
rename from coding/tests/sources/dummys/DummyJSONReader.kt
rename to coding/tests/sources/dummys/DummyJsonReader.kt
index 68febaf..a484bd2 100644
--- a/coding/tests/sources/dummys/DummyJSONReader.kt
+++ b/coding/tests/sources/dummys/DummyJsonReader.kt
@@ -1,18 +1,18 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal open class DummyJSONReader : JSONReader {
+internal open class DummyJsonReader : JsonReader {
 
-	override fun beginValueIsolation() = JSONDepth(0)
+	override fun beginValueIsolation() = JsonDepth(0)
 	override fun close(): Unit = error("")
-	override val depth: JSONDepth get() = error("")
-	override fun endValueIsolation(depth: JSONDepth) {}
+	override val depth: JsonDepth get() = error("")
+	override fun endValueIsolation(depth: JsonDepth) {}
 	override val isInValueIsolation: Boolean get() = false
-	override val nextToken: JSONToken? get() = error("")
+	override val nextToken: JsonToken? get() = error("")
 	override val offset: Int get() = error("")
-	override val path: JSONPath get() = error("")
+	override val path: JsonPath get() = error("")
 	override fun readBoolean(): Boolean = error("")
 	override fun readDouble(): Double = error("")
 	override fun readListEnd(): Unit = error("")
diff --git a/coding/tests/sources/utility/Coding.kt b/coding/tests/sources/utility/Coding.kt
index fcfa39a..346721c 100644
--- a/coding/tests/sources/utility/Coding.kt
+++ b/coding/tests/sources/utility/Coding.kt
@@ -1,17 +1,17 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal fun <Value : Any> JSONDecoderCodec<Value, JSONCodingContext>.parse(source: String, type: JSONCodingType<Value>) =
-	JSONCodingParser.builder()
+internal fun <Value : Any> JsonDecoderCodec<Value, JsonCodingContext>.parse(source: String, type: JsonCodingType<Value>) =
+	JsonCodingParser.builder()
 		.decodingWith(this, base = null)
 		.build()
 		.parseValueOfType(source, type)
 
 
-internal fun <Value : Any> JSONEncoderCodec<Value, JSONCodingContext>.serialize(value: Value) =
-	JSONCodingSerializer.builder()
+internal fun <Value : Any> JsonEncoderCodec<Value, JsonCodingContext>.serialize(value: Value) =
+	JsonCodingSerializer.builder()
 		.encodingWith(this, base = null)
 		.build()
 		.serializeValue(value)
diff --git a/coding/tests/sources/utility/codecs/AnyJSONTestDecoderCodec.kt b/coding/tests/sources/utility/codecs/AnyJSONTestDecoderCodec.kt
deleted file mode 100644
index f38abe3..0000000
--- a/coding/tests/sources/utility/codecs/AnyJSONTestDecoderCodec.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package tests.coding
-
-import com.github.fluidsonic.fluid.json.*
-
-
-internal object AnyJSONTestDecoderCodec : AbstractJSONDecoderCodec<Any, JSONCodingContext>(
-	additionalProviders = listOf(BooleanJSONCodec, ListJSONDecoderCodec, MapJSONCodec, NumberJSONCodec, StringJSONCodec)
-) {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Any>) =
-		AnyJSONDecoderCodec.run { decode(valueType) }
-}
diff --git a/coding/tests/sources/utility/codecs/AnyJsonTestDecoderCodec.kt b/coding/tests/sources/utility/codecs/AnyJsonTestDecoderCodec.kt
new file mode 100644
index 0000000..fa1ddca
--- /dev/null
+++ b/coding/tests/sources/utility/codecs/AnyJsonTestDecoderCodec.kt
@@ -0,0 +1,12 @@
+package tests.coding
+
+import io.fluidsonic.json.*
+
+
+internal object AnyJsonTestDecoderCodec : AbstractJsonDecoderCodec<Any, JsonCodingContext>(
+	additionalProviders = listOf(BooleanJsonCodec, ListJsonDecoderCodec, MapJsonCodec, NumberJsonCodec, StringJsonCodec)
+) {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Any>) =
+		AnyJsonDecoderCodec.run { decode(valueType) }
+}
diff --git a/coding/tests/sources/utility/codecs/ArrayJSONTestEncoderCodec.kt b/coding/tests/sources/utility/codecs/ArrayJSONTestEncoderCodec.kt
deleted file mode 100644
index 5b3d14b..0000000
--- a/coding/tests/sources/utility/codecs/ArrayJSONTestEncoderCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package tests.coding
-
-import com.github.fluidsonic.fluid.json.*
-
-
-internal object ArrayJSONTestEncoderCodec : AbstractJSONEncoderCodec<Array<*>, JSONCodingContext>(
-	additionalProviders = listOf(StringJSONCodec)
-) {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Array<*>) =
-		ArrayJSONCodec.run { encode(value) }
-
-
-	object NonRecursive : AbstractJSONEncoderCodec<Array<*>, JSONCodingContext>(
-		additionalProviders = listOf(StringJSONCodec)
-	) {
-
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Array<*>) =
-			ArrayJSONCodec.nonRecursive.run { encode(value) }
-	}
-}
diff --git a/coding/tests/sources/utility/codecs/ArrayJsonTestEncoderCodec.kt b/coding/tests/sources/utility/codecs/ArrayJsonTestEncoderCodec.kt
new file mode 100644
index 0000000..34ca57a
--- /dev/null
+++ b/coding/tests/sources/utility/codecs/ArrayJsonTestEncoderCodec.kt
@@ -0,0 +1,21 @@
+package tests.coding
+
+import io.fluidsonic.json.*
+
+
+internal object ArrayJsonTestEncoderCodec : AbstractJsonEncoderCodec<Array<*>, JsonCodingContext>(
+	additionalProviders = listOf(StringJsonCodec)
+) {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Array<*>) =
+		ArrayJsonCodec.run { encode(value) }
+
+
+	object NonRecursive : AbstractJsonEncoderCodec<Array<*>, JsonCodingContext>(
+		additionalProviders = listOf(StringJsonCodec)
+	) {
+
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Array<*>) =
+			ArrayJsonCodec.nonRecursive.run { encode(value) }
+	}
+}
diff --git a/coding/tests/sources/utility/codecs/CollectionJSONTestCodec.kt b/coding/tests/sources/utility/codecs/CollectionJSONTestCodec.kt
deleted file mode 100644
index 0617d17..0000000
--- a/coding/tests/sources/utility/codecs/CollectionJSONTestCodec.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package tests.coding
-
-import com.github.fluidsonic.fluid.json.*
-
-
-internal object CollectionJSONTestCodec : AbstractJSONCodec<Collection<*>, JSONCodingContext>(
-	additionalProviders = listOf(AnyJSONDecoderCodec, StringJSONCodec)
-) {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Collection<*>>) =
-		CollectionJSONCodec.run { decode(valueType) }
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Collection<*>) =
-		CollectionJSONCodec.run { encode(value) }
-
-
-	object NonRecursive : AbstractJSONCodec<Collection<*>, JSONCodingContext>(
-		additionalProviders = listOf(StringJSONCodec)
-	) {
-
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Collection<*>>) =
-			CollectionJSONCodec.nonRecursive.run { decode(valueType) }
-
-
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Collection<*>) =
-			CollectionJSONCodec.nonRecursive.run { encode(value) }
-	}
-}
diff --git a/coding/tests/sources/utility/codecs/CollectionJsonTestCodec.kt b/coding/tests/sources/utility/codecs/CollectionJsonTestCodec.kt
new file mode 100644
index 0000000..af11a67
--- /dev/null
+++ b/coding/tests/sources/utility/codecs/CollectionJsonTestCodec.kt
@@ -0,0 +1,29 @@
+package tests.coding
+
+import io.fluidsonic.json.*
+
+
+internal object CollectionJsonTestCodec : AbstractJsonCodec<Collection<*>, JsonCodingContext>(
+	additionalProviders = listOf(AnyJsonDecoderCodec, StringJsonCodec)
+) {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Collection<*>>) =
+		CollectionJsonCodec.run { decode(valueType) }
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Collection<*>) =
+		CollectionJsonCodec.run { encode(value) }
+
+
+	object NonRecursive : AbstractJsonCodec<Collection<*>, JsonCodingContext>(
+		additionalProviders = listOf(StringJsonCodec)
+	) {
+
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Collection<*>>) =
+			CollectionJsonCodec.nonRecursive.run { decode(valueType) }
+
+
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Collection<*>) =
+			CollectionJsonCodec.nonRecursive.run { encode(value) }
+	}
+}
diff --git a/coding/tests/sources/utility/codecs/ContextCheckingTestCodec.kt b/coding/tests/sources/utility/codecs/ContextCheckingTestCodec.kt
index 8220c11..fbe17c8 100644
--- a/coding/tests/sources/utility/codecs/ContextCheckingTestCodec.kt
+++ b/coding/tests/sources/utility/codecs/ContextCheckingTestCodec.kt
@@ -2,24 +2,24 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal class ContextCheckingTestCodec<in Context : JSONCodingContext>(
+internal class ContextCheckingTestCodec<in Context : JsonCodingContext>(
 	private val expectedContext: Context
-) : JSONCodec<String, Context> {
+) : JsonCodec<String, Context> {
 
-	override fun JSONDecoder<Context>.decode(valueType: JSONCodingType<String>): String {
+	override fun JsonDecoder<Context>.decode(valueType: JsonCodingType<String>): String {
 		assert(context).toBe(expectedContext)
 
-		return StringJSONCodec.run { decode(valueType) }
+		return StringJsonCodec.run { decode(valueType) }
 	}
 
 
-	override fun JSONEncoder<Context>.encode(value: String) {
+	override fun JsonEncoder<Context>.encode(value: String) {
 		assert(context).toBe(expectedContext)
 
-		StringJSONCodec.run { encode(value) }
+		StringJsonCodec.run { encode(value) }
 	}
 
 
diff --git a/coding/tests/sources/utility/codecs/ContextCheckingTestDecoderCodec.kt b/coding/tests/sources/utility/codecs/ContextCheckingTestDecoderCodec.kt
index 1ed0a1f..bb3cdbc 100644
--- a/coding/tests/sources/utility/codecs/ContextCheckingTestDecoderCodec.kt
+++ b/coding/tests/sources/utility/codecs/ContextCheckingTestDecoderCodec.kt
@@ -2,17 +2,17 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal class ContextCheckingTestDecoderCodec<in Context : JSONCodingContext>(
+internal class ContextCheckingTestDecoderCodec<in Context : JsonCodingContext>(
 	private val expectedContext: Context
-) : JSONDecoderCodec<String, Context> {
+) : JsonDecoderCodec<String, Context> {
 
-	override fun JSONDecoder<Context>.decode(valueType: JSONCodingType<String>): String {
+	override fun JsonDecoder<Context>.decode(valueType: JsonCodingType<String>): String {
 		assert(context).toBe(expectedContext)
 
-		return StringJSONCodec.run { decode(valueType) }
+		return StringJsonCodec.run { decode(valueType) }
 	}
 
 
diff --git a/coding/tests/sources/utility/codecs/ContextCheckingTestEncoderCodec.kt b/coding/tests/sources/utility/codecs/ContextCheckingTestEncoderCodec.kt
index 31771e3..4c27d95 100644
--- a/coding/tests/sources/utility/codecs/ContextCheckingTestEncoderCodec.kt
+++ b/coding/tests/sources/utility/codecs/ContextCheckingTestEncoderCodec.kt
@@ -2,17 +2,17 @@ package tests.coding
 
 import ch.tutteli.atrium.api.cc.en_GB.*
 import ch.tutteli.atrium.verbs.*
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal class ContextCheckingTestEncoderCodec<in Context : JSONCodingContext>(
+internal class ContextCheckingTestEncoderCodec<in Context : JsonCodingContext>(
 	private val expectedContext: Context
-) : JSONEncoderCodec<String, Context> {
+) : JsonEncoderCodec<String, Context> {
 
-	override fun JSONEncoder<Context>.encode(value: String) {
+	override fun JsonEncoder<Context>.encode(value: String) {
 		assert(context).toBe(expectedContext)
 
-		StringJSONCodec.run { encode(value) }
+		StringJsonCodec.run { encode(value) }
 	}
 
 
diff --git a/coding/tests/sources/utility/codecs/IterableJSONEncoderTestCodec.kt b/coding/tests/sources/utility/codecs/IterableJSONEncoderTestCodec.kt
deleted file mode 100644
index 4761c25..0000000
--- a/coding/tests/sources/utility/codecs/IterableJSONEncoderTestCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package tests.coding
-
-import com.github.fluidsonic.fluid.json.*
-
-
-internal object IterableJSONEncoderTestCodec : AbstractJSONEncoderCodec<Iterable<*>, JSONCodingContext>(
-	additionalProviders = listOf(AnyJSONDecoderCodec, BooleanJSONCodec, NumberJSONCodec, StringJSONCodec)
-) {
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Iterable<*>) =
-		IterableJSONEncoderCodec.run { encode(value) }
-
-
-	object NonRecursive : AbstractJSONEncoderCodec<Iterable<*>, JSONCodingContext>(
-		additionalProviders = listOf(BooleanJSONCodec, IntJSONCodec, StringJSONCodec)
-	) {
-
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Iterable<*>) =
-			IterableJSONEncoderCodec.nonRecursive.run { encode(value) }
-	}
-}
diff --git a/coding/tests/sources/utility/codecs/IterableJsonEncoderTestCodec.kt b/coding/tests/sources/utility/codecs/IterableJsonEncoderTestCodec.kt
new file mode 100644
index 0000000..e1f6cd2
--- /dev/null
+++ b/coding/tests/sources/utility/codecs/IterableJsonEncoderTestCodec.kt
@@ -0,0 +1,21 @@
+package tests.coding
+
+import io.fluidsonic.json.*
+
+
+internal object IterableJsonEncoderTestCodec : AbstractJsonEncoderCodec<Iterable<*>, JsonCodingContext>(
+	additionalProviders = listOf(AnyJsonDecoderCodec, BooleanJsonCodec, NumberJsonCodec, StringJsonCodec)
+) {
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Iterable<*>) =
+		IterableJsonEncoderCodec.run { encode(value) }
+
+
+	object NonRecursive : AbstractJsonEncoderCodec<Iterable<*>, JsonCodingContext>(
+		additionalProviders = listOf(BooleanJsonCodec, IntJsonCodec, StringJsonCodec)
+	) {
+
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Iterable<*>) =
+			IterableJsonEncoderCodec.nonRecursive.run { encode(value) }
+	}
+}
diff --git a/coding/tests/sources/utility/codecs/JaegerCodec.kt b/coding/tests/sources/utility/codecs/JaegerCodec.kt
index 459f08b..1a06e53 100644
--- a/coding/tests/sources/utility/codecs/JaegerCodec.kt
+++ b/coding/tests/sources/utility/codecs/JaegerCodec.kt
@@ -1,14 +1,14 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import tests.coding.Jaeger.*
 
 
-internal object JaegerCodec : AbstractJSONCodec<Jaeger, TestCoderContext>(
+internal object JaegerCodec : AbstractJsonCodec<Jaeger, TestCoderContext>(
 	additionalProviders = listOf(StatusCodec)
 ) {
 
-	override fun JSONDecoder<TestCoderContext>.decode(valueType: JSONCodingType<Jaeger>): Jaeger {
+	override fun JsonDecoder<TestCoderContext>.decode(valueType: JsonCodingType<Jaeger>): Jaeger {
 		var height: Double? = null
 		var launchDate: YearMonthDay? = null
 		var mark: Int? = null
@@ -42,7 +42,7 @@ internal object JaegerCodec : AbstractJSONCodec<Jaeger, TestCoderContext>(
 	}
 
 
-	override fun JSONEncoder<TestCoderContext>.encode(value: Jaeger) {
+	override fun JsonEncoder<TestCoderContext>.encode(value: Jaeger) {
 		writeIntoMap {
 			writeMapElement(Keys.height, double = value.height)
 			writeMapElement(Keys.launchDate, value = value.launchDate)
@@ -67,9 +67,9 @@ internal object JaegerCodec : AbstractJSONCodec<Jaeger, TestCoderContext>(
 	}
 
 
-	object StatusCodec : AbstractJSONCodec<Status, TestCoderContext>() {
+	object StatusCodec : AbstractJsonCodec<Status, TestCoderContext>() {
 
-		override fun JSONDecoder<TestCoderContext>.decode(valueType: JSONCodingType<Status>): Status {
+		override fun JsonDecoder<TestCoderContext>.decode(valueType: JsonCodingType<Status>): Status {
 			val id = readString()
 			return when (id) {
 				"destroyed" -> Status.destroyed
@@ -78,7 +78,7 @@ internal object JaegerCodec : AbstractJSONCodec<Jaeger, TestCoderContext>(
 		}
 
 
-		override fun JSONEncoder<TestCoderContext>.encode(value: Status) {
+		override fun JsonEncoder<TestCoderContext>.encode(value: Status) {
 			writeString(when (value) {
 				Status.destroyed -> "destroyed"
 			})
diff --git a/coding/tests/sources/utility/codecs/KaijuCodec.kt b/coding/tests/sources/utility/codecs/KaijuCodec.kt
index 0746092..5b525f3 100644
--- a/coding/tests/sources/utility/codecs/KaijuCodec.kt
+++ b/coding/tests/sources/utility/codecs/KaijuCodec.kt
@@ -1,14 +1,14 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import tests.coding.Kaiju.*
 
 
-internal object KaijuCodec : AbstractJSONCodec<Kaiju, TestCoderContext>(
+internal object KaijuCodec : AbstractJsonCodec<Kaiju, TestCoderContext>(
 	additionalProviders = listOf(StatusCodec)
 ) {
 
-	override fun JSONDecoder<TestCoderContext>.decode(valueType: JSONCodingType<Kaiju>): Kaiju {
+	override fun JsonDecoder<TestCoderContext>.decode(valueType: JsonCodingType<Kaiju>): Kaiju {
 		var breachDate: YearMonthDay? = null
 		var category: Int? = null
 		var height: Double? = null
@@ -42,7 +42,7 @@ internal object KaijuCodec : AbstractJSONCodec<Kaiju, TestCoderContext>(
 	}
 
 
-	override fun JSONEncoder<TestCoderContext>.encode(value: Kaiju) {
+	override fun JsonEncoder<TestCoderContext>.encode(value: Kaiju) {
 		writeIntoMap {
 			writeMapElement(Keys.breachDate, value = value.breachDate)
 			writeMapElement(Keys.category, int = value.category)
@@ -67,9 +67,9 @@ internal object KaijuCodec : AbstractJSONCodec<Kaiju, TestCoderContext>(
 	}
 
 
-	object StatusCodec : AbstractJSONCodec<Status, TestCoderContext>() {
+	object StatusCodec : AbstractJsonCodec<Status, TestCoderContext>() {
 
-		override fun JSONDecoder<TestCoderContext>.decode(valueType: JSONCodingType<Status>): Status {
+		override fun JsonDecoder<TestCoderContext>.decode(valueType: JsonCodingType<Status>): Status {
 			val id = readString()
 			return when (id) {
 				"deceased" -> Status.deceased
@@ -78,7 +78,7 @@ internal object KaijuCodec : AbstractJSONCodec<Kaiju, TestCoderContext>(
 		}
 
 
-		override fun JSONEncoder<TestCoderContext>.encode(value: Status) {
+		override fun JsonEncoder<TestCoderContext>.encode(value: Status) {
 			writeString(when (value) {
 				Status.deceased -> "deceased"
 			})
diff --git a/coding/tests/sources/utility/codecs/ListJSONTestDecoderCodec.kt b/coding/tests/sources/utility/codecs/ListJSONTestDecoderCodec.kt
deleted file mode 100644
index 598691c..0000000
--- a/coding/tests/sources/utility/codecs/ListJSONTestDecoderCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package tests.coding
-
-import com.github.fluidsonic.fluid.json.*
-
-
-internal object ListJSONTestDecoderCodec : AbstractJSONDecoderCodec<List<*>, JSONCodingContext>(
-	additionalProviders = listOf(AnyJSONDecoderCodec, BooleanJSONCodec, NumberJSONCodec, StringJSONCodec)
-) {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<List<*>>) =
-		ListJSONDecoderCodec.run { decode(valueType) }
-
-
-	object NonRecursive : AbstractJSONDecoderCodec<List<*>, JSONCodingContext>(
-		additionalProviders = listOf(BooleanJSONCodec, IntJSONCodec, StringJSONCodec)
-	) {
-
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<List<*>>) =
-			ListJSONDecoderCodec.nonRecursive.run { decode(valueType) }
-	}
-}
diff --git a/coding/tests/sources/utility/codecs/ListJsonTestDecoderCodec.kt b/coding/tests/sources/utility/codecs/ListJsonTestDecoderCodec.kt
new file mode 100644
index 0000000..8f2f529
--- /dev/null
+++ b/coding/tests/sources/utility/codecs/ListJsonTestDecoderCodec.kt
@@ -0,0 +1,21 @@
+package tests.coding
+
+import io.fluidsonic.json.*
+
+
+internal object ListJsonTestDecoderCodec : AbstractJsonDecoderCodec<List<*>, JsonCodingContext>(
+	additionalProviders = listOf(AnyJsonDecoderCodec, BooleanJsonCodec, NumberJsonCodec, StringJsonCodec)
+) {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<List<*>>) =
+		ListJsonDecoderCodec.run { decode(valueType) }
+
+
+	object NonRecursive : AbstractJsonDecoderCodec<List<*>, JsonCodingContext>(
+		additionalProviders = listOf(BooleanJsonCodec, IntJsonCodec, StringJsonCodec)
+	) {
+
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<List<*>>) =
+			ListJsonDecoderCodec.nonRecursive.run { decode(valueType) }
+	}
+}
diff --git a/coding/tests/sources/utility/codecs/MapJSONTestCodec.kt b/coding/tests/sources/utility/codecs/MapJSONTestCodec.kt
deleted file mode 100644
index 3877d5f..0000000
--- a/coding/tests/sources/utility/codecs/MapJSONTestCodec.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package tests.coding
-
-import com.github.fluidsonic.fluid.json.*
-
-
-internal object MapJSONTestCodec : AbstractJSONCodec<Map<*, *>, JSONCodingContext>(
-	additionalProviders = listOf(AnyJSONDecoderCodec, BooleanJSONCodec, NumberJSONCodec, StringJSONCodec, YearMonthDayCodec)
-) {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Map<*, *>>) =
-		MapJSONCodec.run { decode(valueType) }
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Map<*, *>) =
-		MapJSONCodec.run { encode(value) }
-
-
-	object NonRecursive : AbstractJSONCodec<Map<String, *>, JSONCodingContext>(
-		additionalProviders = listOf(BooleanJSONCodec, IntJSONCodec, StringJSONCodec)
-	) {
-
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Map<String, *>>) =
-			MapJSONCodec.nonRecursive.run { decode(valueType) }
-
-
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Map<String, *>) =
-			MapJSONCodec.nonRecursive.run { encode(value) }
-	}
-}
diff --git a/coding/tests/sources/utility/codecs/MapJsonTestCodec.kt b/coding/tests/sources/utility/codecs/MapJsonTestCodec.kt
new file mode 100644
index 0000000..12e2c56
--- /dev/null
+++ b/coding/tests/sources/utility/codecs/MapJsonTestCodec.kt
@@ -0,0 +1,29 @@
+package tests.coding
+
+import io.fluidsonic.json.*
+
+
+internal object MapJsonTestCodec : AbstractJsonCodec<Map<*, *>, JsonCodingContext>(
+	additionalProviders = listOf(AnyJsonDecoderCodec, BooleanJsonCodec, NumberJsonCodec, StringJsonCodec, YearMonthDayCodec)
+) {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Map<*, *>>) =
+		MapJsonCodec.run { decode(valueType) }
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Map<*, *>) =
+		MapJsonCodec.run { encode(value) }
+
+
+	object NonRecursive : AbstractJsonCodec<Map<String, *>, JsonCodingContext>(
+		additionalProviders = listOf(BooleanJsonCodec, IntJsonCodec, StringJsonCodec)
+	) {
+
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Map<String, *>>) =
+			MapJsonCodec.nonRecursive.run { decode(valueType) }
+
+
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Map<String, *>) =
+			MapJsonCodec.nonRecursive.run { encode(value) }
+	}
+}
diff --git a/coding/tests/sources/utility/codecs/SequenceJSONTestCodec.kt b/coding/tests/sources/utility/codecs/SequenceJSONTestCodec.kt
deleted file mode 100644
index b89da52..0000000
--- a/coding/tests/sources/utility/codecs/SequenceJSONTestCodec.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package tests.coding
-
-import com.github.fluidsonic.fluid.json.*
-
-
-internal object SequenceJSONTestCodec : AbstractJSONCodec<Sequence<*>, JSONCodingContext>(
-	additionalProviders = listOf(AnyJSONDecoderCodec, BooleanJSONCodec, IterableJSONEncoderCodec, ListJSONDecoderCodec, NumberJSONCodec, StringJSONCodec)
-) {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Sequence<*>>) =
-		SequenceJSONCodec.run { decode(valueType) }
-
-
-	override fun JSONEncoder<JSONCodingContext>.encode(value: Sequence<*>) =
-		SequenceJSONCodec.run { encode(value) }
-
-
-	object NonRecursive : AbstractJSONCodec<Sequence<*>, JSONCodingContext>(
-		additionalProviders = listOf(BooleanJSONCodec, IntJSONCodec, IterableJSONEncoderCodec, StringJSONCodec)
-	) {
-
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Sequence<*>>) =
-			SequenceJSONCodec.nonRecursive.run { decode(valueType) }
-
-
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Sequence<*>) =
-			SequenceJSONCodec.nonRecursive.run { encode(value) }
-	}
-}
diff --git a/coding/tests/sources/utility/codecs/SequenceJsonTestCodec.kt b/coding/tests/sources/utility/codecs/SequenceJsonTestCodec.kt
new file mode 100644
index 0000000..9a8dcf4
--- /dev/null
+++ b/coding/tests/sources/utility/codecs/SequenceJsonTestCodec.kt
@@ -0,0 +1,29 @@
+package tests.coding
+
+import io.fluidsonic.json.*
+
+
+internal object SequenceJsonTestCodec : AbstractJsonCodec<Sequence<*>, JsonCodingContext>(
+	additionalProviders = listOf(AnyJsonDecoderCodec, BooleanJsonCodec, IterableJsonEncoderCodec, ListJsonDecoderCodec, NumberJsonCodec, StringJsonCodec)
+) {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Sequence<*>>) =
+		SequenceJsonCodec.run { decode(valueType) }
+
+
+	override fun JsonEncoder<JsonCodingContext>.encode(value: Sequence<*>) =
+		SequenceJsonCodec.run { encode(value) }
+
+
+	object NonRecursive : AbstractJsonCodec<Sequence<*>, JsonCodingContext>(
+		additionalProviders = listOf(BooleanJsonCodec, IntJsonCodec, IterableJsonEncoderCodec, StringJsonCodec)
+	) {
+
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Sequence<*>>) =
+			SequenceJsonCodec.nonRecursive.run { decode(valueType) }
+
+
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Sequence<*>) =
+			SequenceJsonCodec.nonRecursive.run { encode(value) }
+	}
+}
diff --git a/coding/tests/sources/utility/codecs/SetJSONTestDecoderCodec.kt b/coding/tests/sources/utility/codecs/SetJSONTestDecoderCodec.kt
deleted file mode 100644
index 7e7cff0..0000000
--- a/coding/tests/sources/utility/codecs/SetJSONTestDecoderCodec.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package tests.coding
-
-import com.github.fluidsonic.fluid.json.*
-
-
-internal object SetJSONTestDecoderCodec : AbstractJSONDecoderCodec<Set<*>, JSONCodingContext>(
-	additionalProviders = listOf(AnyJSONDecoderCodec, BooleanJSONCodec, ListJSONDecoderCodec, NumberJSONCodec, StringJSONCodec)
-) {
-
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Set<*>>) =
-		SetJSONDecoderCodec.run { decode(valueType) }
-
-
-	object NonRecursive : AbstractJSONDecoderCodec<Set<*>, JSONCodingContext>(
-		additionalProviders = listOf(BooleanJSONCodec, NumberJSONCodec, StringJSONCodec)
-	) {
-
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Set<*>>) =
-			SetJSONDecoderCodec.nonRecursive.run { decode(valueType) }
-	}
-}
diff --git a/coding/tests/sources/utility/codecs/SetJsonTestDecoderCodec.kt b/coding/tests/sources/utility/codecs/SetJsonTestDecoderCodec.kt
new file mode 100644
index 0000000..019d413
--- /dev/null
+++ b/coding/tests/sources/utility/codecs/SetJsonTestDecoderCodec.kt
@@ -0,0 +1,21 @@
+package tests.coding
+
+import io.fluidsonic.json.*
+
+
+internal object SetJsonTestDecoderCodec : AbstractJsonDecoderCodec<Set<*>, JsonCodingContext>(
+	additionalProviders = listOf(AnyJsonDecoderCodec, BooleanJsonCodec, ListJsonDecoderCodec, NumberJsonCodec, StringJsonCodec)
+) {
+
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Set<*>>) =
+		SetJsonDecoderCodec.run { decode(valueType) }
+
+
+	object NonRecursive : AbstractJsonDecoderCodec<Set<*>, JsonCodingContext>(
+		additionalProviders = listOf(BooleanJsonCodec, NumberJsonCodec, StringJsonCodec)
+	) {
+
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Set<*>>) =
+			SetJsonDecoderCodec.NON_RECURSIVE.run { decode(valueType) }
+	}
+}
diff --git a/coding/tests/sources/utility/codecs/TestCoderContext.kt b/coding/tests/sources/utility/codecs/TestCoderContext.kt
index d65d1a3..1b5b8ad 100644
--- a/coding/tests/sources/utility/codecs/TestCoderContext.kt
+++ b/coding/tests/sources/utility/codecs/TestCoderContext.kt
@@ -1,6 +1,6 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal class TestCoderContext : JSONCodingContext
+internal class TestCoderContext : JsonCodingContext
diff --git a/coding/tests/sources/utility/codecs/UniverseCodec.kt b/coding/tests/sources/utility/codecs/UniverseCodec.kt
index 1ca8ed0..02ee46b 100644
--- a/coding/tests/sources/utility/codecs/UniverseCodec.kt
+++ b/coding/tests/sources/utility/codecs/UniverseCodec.kt
@@ -1,11 +1,11 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal object UniverseCodec : AbstractJSONCodec<Universe, TestCoderContext>() {
+internal object UniverseCodec : AbstractJsonCodec<Universe, TestCoderContext>() {
 
-	override fun JSONDecoder<TestCoderContext>.decode(valueType: JSONCodingType<Universe>): Universe {
+	override fun JsonDecoder<TestCoderContext>.decode(valueType: JsonCodingType<Universe>): Universe {
 		var jaegers: List<Jaeger>? = null
 		var kaijus: List<Kaiju>? = null
 
@@ -24,7 +24,7 @@ internal object UniverseCodec : AbstractJSONCodec<Universe, TestCoderContext>()
 	}
 
 
-	override fun JSONEncoder<TestCoderContext>.encode(value: Universe) {
+	override fun JsonEncoder<TestCoderContext>.encode(value: Universe) {
 		writeIntoMap {
 			writeMapElement(Keys.jaegers, value = value.jaegers)
 			writeMapElement(Keys.kaijus, value = value.kaijus)
diff --git a/coding/tests/sources/utility/codecs/YearMonthDayCodec.kt b/coding/tests/sources/utility/codecs/YearMonthDayCodec.kt
index a3a34bc..b72f58c 100644
--- a/coding/tests/sources/utility/codecs/YearMonthDayCodec.kt
+++ b/coding/tests/sources/utility/codecs/YearMonthDayCodec.kt
@@ -1,17 +1,17 @@
 package tests.coding
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
-internal object YearMonthDayCodec : AbstractJSONCodec<YearMonthDay, JSONCodingContext>() {
+internal object YearMonthDayCodec : AbstractJsonCodec<YearMonthDay, JsonCodingContext>() {
 
-	override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<YearMonthDay>) =
+	override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<YearMonthDay>) =
 		readString().let { raw ->
 			YearMonthDay.parse(raw) ?: invalidValueError("expected date in format YYYY-MM-DD, got '$raw'")
 		}
 
 
-	override fun JSONEncoder<JSONCodingContext>.encode(value: YearMonthDay) {
+	override fun JsonEncoder<JsonCodingContext>.encode(value: YearMonthDay) {
 		writeString(value.toString())
 	}
 }
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index a74194e..3ef5980 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -1,11 +1,10 @@
-import com.github.fluidsonic.fluid.library.*
+import io.fluidsonic.gradle.*
 
 plugins {
 	kotlin("kapt")
 }
 
-fluidJvmLibraryVariant {
-	jdk = JvmTarget.jdk8
+fluidJvmLibraryVariant(JvmTarget.jdk8) {
 	publishing = false
 }
 
@@ -15,7 +14,3 @@ dependencies {
 
 	kapt(project(":fluid-json-annotation-processor"))
 }
-
-configurations.getByName("kapt") {
-	attributes.attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, "java-runtime"))
-}
diff --git a/examples/sources/0000-Basics.kt b/examples/sources/0000-Basics.kt
index ccaf80e..dafb6ac 100644
--- a/examples/sources/0000-Basics.kt
+++ b/examples/sources/0000-Basics.kt
@@ -1,12 +1,12 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.time.*
 
 // Note that IntelliJ IDEA still only has limited supported for annotation processing with kapt, so enable this setting first:
 // Preferences > Build, Execution, Deployment > Build Tools > Gradle > Runner > Delegate IDE build/run actions to gradle
 
-// EventJSONCodec and AttendeeJSONCodec are generated automatically for the @JSON-annotated classes in this file
+// EventJsonCodec and AttendeeJsonCodec are generated automatically for the @Json-annotated classes in this file
 
 fun main() {
 	val data = Event(
@@ -21,15 +21,15 @@ fun main() {
 		title = "fluid-json MeetUp"
 	)
 
-	val serializer = JSONCodingSerializer.builder(MyContext()) // see example 0001
-		.encodingWith(EventJSONCodec, AttendeeJSONCodec)
+	val serializer = JsonCodingSerializer.builder(MyContext()) // see example 0001
+		.encodingWith(EventJsonCodec, AttendeeJsonCodec)
 		.build()
 
 	val serialized = serializer.serializeValue(data)
 	println("serialized: $serialized")
 
-	val parser = JSONCodingParser.builder(MyContext()) // see example 0001
-		.decodingWith(EventJSONCodec, AttendeeJSONCodec)
+	val parser = JsonCodingParser.builder(MyContext()) // see example 0001
+		.decodingWith(EventJsonCodec, AttendeeJsonCodec)
 		.build()
 
 	val parsed = parser.parseValueOfType<Event>(serialized)
@@ -37,7 +37,7 @@ fun main() {
 }
 
 
-@JSON
+@Json
 data class Event(
 	val attendees: Collection<Attendee>,
 	val description: String,
@@ -47,7 +47,7 @@ data class Event(
 	val title: String
 )
 
-@JSON
+@Json
 data class Attendee(
 	val emailAddress: String,
 	val firstName: String,
diff --git a/examples/sources/0001-CodecProvider.kt b/examples/sources/0001-CodecProvider.kt
index 6712e11..e8d8f1d 100644
--- a/examples/sources/0001-CodecProvider.kt
+++ b/examples/sources/0001-CodecProvider.kt
@@ -1,17 +1,17 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 // Note that IntelliJ IDEA still only has limited supported for annotation processing with kapt, so enable this setting first:
 // Preferences > Build, Execution, Deployment > Build Tools > Gradle > Runner > Delegate IDE build/run actions to gradle
 
-// MyCodecProvider will be generated automatically and provides all JSONCodecs created by annotation processing in the same module.
+// MyCodecProvider will be generated automatically and provides all JsonCodecs created by annotation processing in the same module.
 // A custom context type can be used to provide additional information during encoding.
 
-@JSON.CodecProvider
-interface MyCodecProvider : JSONCodecProvider<MyContext>
+@Json.CodecProvider
+interface MyCodecProvider : JsonCodecProvider<MyContext>
 
 
 data class MyContext(
 	val authenticatedUserId: String? = null
-) : JSONCodingContext
+) : JsonCodingContext
diff --git a/examples/sources/0002-CustomProperties.kt b/examples/sources/0002-CustomProperties.kt
index 7dee8d7..4d4f50a 100644
--- a/examples/sources/0002-CustomProperties.kt
+++ b/examples/sources/0002-CustomProperties.kt
@@ -1,17 +1,17 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 // Note that IntelliJ IDEA still only has limited supported for annotation processing with kapt, so enable this setting first:
 // Preferences > Build, Execution, Deployment > Build Tools > Gradle > Runner > Delegate IDE build/run actions to gradle
 
-// @JSON.CustomProperties allows writing custom code to add properties on-the-fly, potentially making use of a context object.
+// @Json.CustomProperties allows writing custom code to add properties on-the-fly, potentially making use of a context object.
 
 
 fun main() {
-	val serializer = JSONCodingSerializer
+	val serializer = JsonCodingSerializer
 		.builder(MyContext(authenticatedUserId = "5678"))
-		.encodingWith(JSONCodecProvider.generated(MyCodecProvider::class))
+		.encodingWith(JsonCodecProvider.generated(MyCodecProvider::class))
 		.build()
 
 	println(serializer.serializeValue(listOf(
@@ -21,19 +21,19 @@ fun main() {
 }
 
 
-@JSON(
-	decoding = JSON.Decoding.none,                // prevent decoding altogether
-	encoding = JSON.Encoding.annotatedProperties  // only encode properties annotated explicitly
+@Json(
+	decoding = Json.Decoding.none,                // prevent decoding altogether
+	encoding = Json.Encoding.annotatedProperties  // only encode properties annotated explicitly
 )
 data class User(
-	@JSON.Property val id: String,
-	@JSON.Property val name: String,
+	@Json.Property val id: String,
+	@Json.Property val name: String,
 	val emailAddress: String
 )
 
 
-@JSON.CustomProperties  // function will be called during encoding
-fun JSONEncoder<MyContext>.writeCustomProperties(value: User) {
+@Json.CustomProperties  // function will be called during encoding
+fun JsonEncoder<MyContext>.writeCustomProperties(value: User) {
 	if (context.authenticatedUserId == value.id)
 		writeMapElement("emailAddress", value = value.emailAddress)
 }
diff --git a/examples/sources/0010-Parsing.kt b/examples/sources/0010-Parsing.kt
index b117e7a..fb03cd4 100644
--- a/examples/sources/0010-Parsing.kt
+++ b/examples/sources/0010-Parsing.kt
@@ -1,17 +1,17 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 fun main() {
-	val parser = JSONParser.default
+	val parser = JsonParser.default
 
 	// Given a JSON string you get a value of basic Kotlin types (String, Int, List, Map, etc.)
 	val value1 = parser.parseValue(""" { "hello": "world", "test": 123 } """)
 	println(value1)
 
 	// Many functions have `…OrNull` versions which allow a `null` value to be returned instead of causing a
-	// `JSONException` in such cases.
+	// `JsonException` in such cases.
 	val value2 = parser.parseValueOrNull("null")
 	println(value2)
 }
diff --git a/examples/sources/0011-ParsingFromReader.kt b/examples/sources/0011-ParsingFromReader.kt
index bc60899..1397493 100644
--- a/examples/sources/0011-ParsingFromReader.kt
+++ b/examples/sources/0011-ParsingFromReader.kt
@@ -1,11 +1,11 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.*
 
 
 fun main() {
-	val parser = JSONParser.default
+	val parser = JsonParser.default
 
 	// You can also let the parser read from a Reader
 	val value = parser.parseValue(StringReader(""" { "hello": "world", "test": 123 } """))
diff --git a/examples/sources/0012-ParsingLists.kt b/examples/sources/0012-ParsingLists.kt
index 50c9844..85c97c9 100644
--- a/examples/sources/0012-ParsingLists.kt
+++ b/examples/sources/0012-ParsingLists.kt
@@ -1,10 +1,10 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 fun main() {
-	val parser = JSONCodingParser.default
+	val parser = JsonCodingParser.default
 
 	// You can parse a List of values in a typesafe way
 	val value1 = parser.parseValueOfType<List<*>>("[1, true, []]")
diff --git a/examples/sources/0013-ParsingMaps.kt b/examples/sources/0013-ParsingMaps.kt
index 62e2698..7457e6f 100644
--- a/examples/sources/0013-ParsingMaps.kt
+++ b/examples/sources/0013-ParsingMaps.kt
@@ -1,10 +1,10 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 fun main() {
-	val parser = JSONCodingParser.default
+	val parser = JsonCodingParser.default
 
 	// You can parse a Map of keys and values in a typesafe way
 	val value1 = parser.parseValueOfType<Map<*, *>>("""{ "one": 1, "two": 2, "three": 3 }""")
diff --git a/examples/sources/0014-ParsingAsStream.kt b/examples/sources/0014-ParsingAsStream.kt
index a7eb096..a3164e9 100644
--- a/examples/sources/0014-ParsingAsStream.kt
+++ b/examples/sources/0014-ParsingAsStream.kt
@@ -1,13 +1,13 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.*
 
 
 fun main() {
 	// You can read values directly from a stream without having to parse all at once
 	val input = StringReader("""{ "data": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] }""")
-	JSONReader.build(input).use { reader ->
+	JsonReader.build(input).use { reader ->
 		reader.readFromMapByElementValue { key ->
 			println(key)
 
diff --git a/examples/sources/0015-ParsingAsStreamLowLevel.kt b/examples/sources/0015-ParsingAsStreamLowLevel.kt
index 5fc5a66..e2eb971 100644
--- a/examples/sources/0015-ParsingAsStreamLowLevel.kt
+++ b/examples/sources/0015-ParsingAsStreamLowLevel.kt
@@ -1,19 +1,19 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.*
 
 
 fun main() {
 	// You can also avoid the higher-order functions for stream parsing and read token by token
 	val input = StringReader("""{ "data": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] }""")
-	JSONReader.build(input).use { reader ->
+	JsonReader.build(input).use { reader ->
 		reader.apply {
 			readMapStart()
 			println(readMapKey())
 
 			readListStart()
-			while (nextToken != JSONToken.listEnd) {
+			while (nextToken != JsonToken.listEnd) {
 				println(readInt())
 			}
 			readListEnd()
diff --git a/examples/sources/0020-Serializing.kt b/examples/sources/0020-Serializing.kt
index b3ad506..18eae9d 100644
--- a/examples/sources/0020-Serializing.kt
+++ b/examples/sources/0020-Serializing.kt
@@ -1,10 +1,10 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 
 
 fun main() {
-	val serializer = JSONSerializer.default
+	val serializer = JsonSerializer.default
 
 	// Given a value of a basic Kotlin type (String, Int, List, Map, etc.) you can get a JSON string
 	val json = serializer.serializeValue(mapOf(
diff --git a/examples/sources/0021-SerializingToWriter.kt b/examples/sources/0021-SerializingToWriter.kt
index 07e10a2..80f4b49 100644
--- a/examples/sources/0021-SerializingToWriter.kt
+++ b/examples/sources/0021-SerializingToWriter.kt
@@ -1,11 +1,11 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.*
 
 
 fun main() {
-	val serializer = JSONSerializer.default
+	val serializer = JsonSerializer.default
 
 	// You can also let the serializer write to a Writer
 	val writer = StringWriter()
diff --git a/examples/sources/0022-SerializingAsStream.kt b/examples/sources/0022-SerializingAsStream.kt
index 7c32ec3..aa2cf0c 100644
--- a/examples/sources/0022-SerializingAsStream.kt
+++ b/examples/sources/0022-SerializingAsStream.kt
@@ -1,13 +1,13 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.*
 
 
 fun main() {
 	// You can write values directly to a stream without having to build the temporary map or list
 	val output = StringWriter()
-	JSONWriter.build(output).use { writer ->
+	JsonWriter.build(output).use { writer ->
 		writer.writeIntoMap {
 			writeMapElement("data") {
 				writeIntoList {
diff --git a/examples/sources/0023-SerializingAsStreamLowLevel.kt b/examples/sources/0023-SerializingAsStreamLowLevel.kt
index 0c74f25..14c6fdb 100644
--- a/examples/sources/0023-SerializingAsStreamLowLevel.kt
+++ b/examples/sources/0023-SerializingAsStreamLowLevel.kt
@@ -1,13 +1,13 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
+import io.fluidsonic.json.*
 import java.io.*
 
 
 fun main() {
 	// You can also avoid the higher-order functions for stream serializing and write token by token
 	val output = StringWriter()
-	JSONWriter.build(output).use { writer ->
+	JsonWriter.build(output).use { writer ->
 		writer.apply {
 			writeMapStart()
 			writeMapKey("data")
diff --git a/examples/sources/0030-TypeEncoderCodecs.kt b/examples/sources/0030-TypeEncoderCodecs.kt
index 5984027..6b1961a 100644
--- a/examples/sources/0030-TypeEncoderCodecs.kt
+++ b/examples/sources/0030-TypeEncoderCodecs.kt
@@ -1,15 +1,15 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
 import examples.EncodingExample.Event
 import examples.EncodingExample.EventCodec
+import io.fluidsonic.json.*
 import java.time.*
 
 
 fun main() {
 	// Using a codec for encoding specific Kotlin types simplifies JSON serialization a lot
 
-	val serializer = JSONCodingSerializer.builder()
+	val serializer = JsonCodingSerializer.builder()
 		.encodingWith(EventCodec)
 		.build()
 
@@ -45,9 +45,9 @@ private object EncodingExample {
 	}
 
 
-	object EventCodec : AbstractJSONEncoderCodec<Event, JSONCodingContext>() {
+	object EventCodec : AbstractJsonEncoderCodec<Event, JsonCodingContext>() {
 
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Event) {
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Event) {
 			writeIntoMap {
 				writeMapElement("id", int = value.id)
 				writeMapElement("date", value = value.date, skipIfNull = true)
diff --git a/examples/sources/0031-TypeDecoderCodecs.kt b/examples/sources/0031-TypeDecoderCodecs.kt
index 31710c2..1db24f3 100644
--- a/examples/sources/0031-TypeDecoderCodecs.kt
+++ b/examples/sources/0031-TypeDecoderCodecs.kt
@@ -1,15 +1,15 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
 import examples.DecodingExample.Event
 import examples.DecodingExample.EventCodec
+import io.fluidsonic.json.*
 import java.time.*
 
 
 fun main() {
 	// Using a codec for decoding specific classes simplifies JSON parsing a lot
 
-	val parser = JSONCodingParser.builder()
+	val parser = JsonCodingParser.builder()
 		.decodingWith(EventCodec)
 		.build()
 
@@ -76,9 +76,9 @@ private object DecodingExample {
 	}
 
 
-	object EventCodec : AbstractJSONDecoderCodec<Event, JSONCodingContext>() {
+	object EventCodec : AbstractJsonDecoderCodec<Event, JsonCodingContext>() {
 
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Event>): Event {
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Event>): Event {
 			var id: Int? = null
 			var date: Instant? = null
 			var title: String? = null
diff --git a/examples/sources/0032-TypeCodecs.kt b/examples/sources/0032-TypeCodecs.kt
index bff6b31..aaccc42 100644
--- a/examples/sources/0032-TypeCodecs.kt
+++ b/examples/sources/0032-TypeCodecs.kt
@@ -1,8 +1,8 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
 import examples.CodingExample.Event
 import examples.CodingExample.EventCodec
+import io.fluidsonic.json.*
 import java.time.*
 
 
@@ -18,13 +18,13 @@ fun main() {
 		Event(id = 6, title = "Six", type = Event.Type.GOOD_NIGHT_OF_SLEEP)
 	)
 
-	val serializer = JSONCodingSerializer.builder()
+	val serializer = JsonCodingSerializer.builder()
 		.encodingWith(EventCodec)
 		.build()
 
 	val json = serializer.serializeValue(original)
 
-	val parser = JSONCodingParser.builder()
+	val parser = JsonCodingParser.builder()
 		.decodingWith(EventCodec)
 		.build()
 
@@ -56,9 +56,9 @@ private object CodingExample {
 	}
 
 
-	object EventCodec : AbstractJSONCodec<Event, JSONCodingContext>() {
+	object EventCodec : AbstractJsonCodec<Event, JsonCodingContext>() {
 
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Event>): Event {
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Event>): Event {
 			var id: Int? = null
 			var date: Instant? = null
 			var title: String? = null
@@ -83,7 +83,7 @@ private object CodingExample {
 		}
 
 
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Event) {
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Event) {
 			writeIntoMap {
 				writeMapElement("id", int = value.id)
 				writeMapElement("date", value = value.date, skipIfNull = true)
diff --git a/examples/sources/0033-CodingAsStream.kt b/examples/sources/0033-CodingAsStream.kt
index fb7cb7a..a7a6689 100644
--- a/examples/sources/0033-CodingAsStream.kt
+++ b/examples/sources/0033-CodingAsStream.kt
@@ -1,16 +1,16 @@
 package examples
 
-import com.github.fluidsonic.fluid.json.*
 import examples.CodingAsStreamExample.Event
 import examples.CodingAsStreamExample.decode
 import examples.CodingAsStreamExample.encode
+import io.fluidsonic.json.*
 import java.io.*
 import java.time.*
 
 
 fun main() {
-	// Parsing and serialization using codecs is also supported when streaming by using JSONDecoder instead of
-	// JSONReader and JSONEncoder instead of JSONWriter
+	// Parsing and serialization using codecs is also supported when streaming by using JsonDecoder instead of
+	// JsonReader and JsonEncoder instead of JsonWriter
 
 	val input = listOf(
 		Event(id = 1, date = Instant.ofEpochSecond(1000000000), title = "One"),
@@ -33,7 +33,7 @@ fun main() {
 private object CodingAsStreamExample {
 
 	fun decode(json: String) =
-		JSONDecoder.builder()
+		JsonDecoder.builder()
 			.codecs(EventCodec)
 			.source(json)
 			.build()
@@ -41,7 +41,7 @@ private object CodingAsStreamExample {
 				val output = mutableListOf<Event>()
 
 				decoder.readListStart()
-				while (decoder.nextToken != JSONToken.listEnd) {
+				while (decoder.nextToken != JsonToken.listEnd) {
 					output.add(decoder.readValueOfType())
 				}
 				decoder.readListEnd()
@@ -53,7 +53,7 @@ private object CodingAsStreamExample {
 	fun encode(input: List<Event>): String {
 		val writer = StringWriter()
 
-		return JSONEncoder.builder()
+		return JsonEncoder.builder()
 			.codecs(EventCodec)
 			.destination(writer)
 			.build()
@@ -76,9 +76,9 @@ private object CodingAsStreamExample {
 	)
 
 
-	object EventCodec : AbstractJSONCodec<Event, JSONCodingContext>() {
+	object EventCodec : AbstractJsonCodec<Event, JsonCodingContext>() {
 
-		override fun JSONDecoder<JSONCodingContext>.decode(valueType: JSONCodingType<Event>): Event {
+		override fun JsonDecoder<JsonCodingContext>.decode(valueType: JsonCodingType<Event>): Event {
 			var id: Int? = null
 			var date: Instant? = null
 			var title: String? = null
@@ -100,7 +100,7 @@ private object CodingAsStreamExample {
 		}
 
 
-		override fun JSONEncoder<JSONCodingContext>.encode(value: Event) {
+		override fun JsonEncoder<JsonCodingContext>.encode(value: Event) {
 			writeIntoMap {
 				writeMapElement("id", int = value.id)
 				writeMapElement("date", value = value.date, skipIfNull = true)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ca9d628..3a54a33 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ktor-client/build.gradle.kts b/ktor-client/build.gradle.kts
index e00e007..2beb30b 100644
--- a/ktor-client/build.gradle.kts
+++ b/ktor-client/build.gradle.kts
@@ -1,11 +1,11 @@
-import com.github.fluidsonic.fluid.library.*
+import io.fluidsonic.gradle.*
 
-fluidJvmLibraryVariant {
+fluidJvmLibraryVariant(JvmTarget.jdk7) {
 	description = "A JSON library written in pure Kotlin (Ktor Client extension)"
 }
 
 dependencies {
 	api(project(":fluid-json-coding"))
 
-	api("io.ktor:ktor-client-json-jvm:1.2.3")
+	api("io.ktor:ktor-client-json-jvm:1.2.5")
 }
diff --git a/ktor-client/sources/FluidJsonSerializer.kt b/ktor-client/sources/FluidJsonSerializer.kt
index d127829..812ec35 100644
--- a/ktor-client/sources/FluidJsonSerializer.kt
+++ b/ktor-client/sources/FluidJsonSerializer.kt
@@ -1,9 +1,9 @@
 @file:Suppress("INVISIBLE_MEMBER")
 
-package com.github.fluidsonic.fluid.json
+package io.fluidsonic.json
 
 import io.ktor.client.call.*
-import io.ktor.client.features.json.*
+import io.ktor.client.features.json.JsonSerializer
 import io.ktor.content.TextContent
 import io.ktor.http.*
 import io.ktor.http.content.*
@@ -11,12 +11,12 @@ import kotlinx.io.core.*
 
 
 class FluidJsonSerializer(
-	private val parser: JSONCodingParser<*> = JSONCodingParser.nonRecursive,
-	private val serializer: JSONCodingSerializer = JSONCodingSerializer.nonRecursive
+	private val parser: JsonCodingParser<*> = JsonCodingParser.nonRecursive,
+	private val serializer: JsonCodingSerializer = JsonCodingSerializer.nonRecursive
 ) : JsonSerializer {
 
 	override fun read(type: TypeInfo, body: Input) =
-		parser.parseValueOfType(body.readText(), JSONCodingType.of(type.reifiedType))
+		parser.parseValueOfType(body.readText(), JsonCodingType.of(type.reifiedType))
 
 
 	override fun write(data: Any, contentType: ContentType): OutgoingContent =
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a87d60b..cce70c5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven("https://dl.bintray.com/fluidsonic/maven")
+		maven("https://dl.bintray.com/fluidsonic/kotlin")
 	}
 }