diff --git a/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt b/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
index 45fc2a2..55b8cac 100644
--- a/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
@@ -117,7 +117,7 @@
     prebuilts(LibraryGroups.REMOTECALLBACK, "1.0.0-alpha02")
     // TODO: Remove this once b/157899389 is resolved
     ignore(LibraryGroups.ROOM.group, "room-compiler")
-    ignore(LibraryGroups.ROOM.group, "room-compiler-xprocessing")
+    ignore(LibraryGroups.ROOM.group, "room-compiler-processing")
     // TODO: Remove during release phase of rxjava3 artifact
     ignore(LibraryGroups.ROOM.group, "room-rxjava3")
     prebuilts(LibraryGroups.ROOM, "2.3.0-alpha02")
diff --git a/room/compiler-xprocessing/build.gradle b/room/compiler-processing/build.gradle
similarity index 100%
rename from room/compiler-xprocessing/build.gradle
rename to room/compiler-processing/build.gradle
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/JavaPoetExt.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/JavaPoetExt.kt
similarity index 93%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/JavaPoetExt.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/JavaPoetExt.kt
index 179e8ba..2b40286 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/JavaPoetExt.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/JavaPoetExt.kt
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.javac.JavacElement
-import androidx.room.processing.javac.JavacExecutableElement
+import androidx.room.compiler.processing.javac.JavacElement
+import androidx.room.compiler.processing.javac.JavacExecutableElement
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.MethodSpec
 import com.squareup.javapoet.ParameterSpec
@@ -35,7 +35,7 @@
  *
  * We should still strive to avoid these cases, maybe turn it to an error in tests.
  */
-private val NONE_TYPE_NAME = ClassName.get("androidx.room.processing.error", "NotAType")
+private val NONE_TYPE_NAME = ClassName.get("androidx.room.compiler.processing.error", "NotAType")
 
 internal fun TypeMirror.safeTypeName(): TypeName = if (kind == TypeKind.NONE) {
     NONE_TYPE_NAME
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/JavacTestProcessor.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/JavacTestProcessor.kt
similarity index 91%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/JavacTestProcessor.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/JavacTestProcessor.kt
index 86bbde9..134cc91 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/JavacTestProcessor.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/JavacTestProcessor.kt
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 import androidx.annotation.VisibleForTesting
-import androidx.room.processing.javac.JavacProcessingEnv
-import androidx.room.processing.javac.JavacRoundEnv
+import androidx.room.compiler.processing.javac.JavacProcessingEnv
+import androidx.room.compiler.processing.javac.JavacRoundEnv
 import javax.annotation.processing.AbstractProcessor
 import javax.annotation.processing.RoundEnvironment
 import javax.lang.model.element.TypeElement
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XAnnotationBox.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XAnnotationBox.kt
similarity index 97%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XAnnotationBox.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XAnnotationBox.kt
index 7a7ced9..1e9282d 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XAnnotationBox.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XAnnotationBox.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * This wraps an annotation element that is both accessible from the processor and runtime.
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XArrayType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XArrayType.kt
similarity index 94%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XArrayType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XArrayType.kt
index eea3a09..e46da1a 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XArrayType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XArrayType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * Represents an Array type including Kotlin's [Array] type.
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XConstructorElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XConstructorElement.kt
similarity index 94%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XConstructorElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XConstructorElement.kt
index 37d179a..fd78865 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XConstructorElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XConstructorElement.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * Represents a constructor of a class.
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XDeclaredType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XDeclaredType.kt
similarity index 95%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XDeclaredType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XDeclaredType.kt
index b9928fc..a6e1917 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XDeclaredType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XDeclaredType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * Represents a Declared type that is either an interface or class.
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XElement.kt
similarity index 98%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XElement.kt
index 840f9a8..3e9db8a 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XElement.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 import kotlin.contracts.contract
 import kotlin.reflect.KClass
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XEquality.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XEquality.kt
similarity index 97%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XEquality.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XEquality.kt
index b0189d54..0a65f9c 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XEquality.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XEquality.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * Helper interface to enforce implementing equality in wrappers so that we don't by mistake
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XExecutableElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XExecutableElement.kt
similarity index 96%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XExecutableElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XExecutableElement.kt
index 1bb53ea..4187d44f 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XExecutableElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XExecutableElement.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * Represents a method, constructor or initializer.
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XMessager.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMessager.kt
similarity index 95%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XMessager.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMessager.kt
index 3962338..0701c52 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XMessager.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMessager.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 import javax.tools.Diagnostic
 
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XMethodElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMethodElement.kt
similarity index 97%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XMethodElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMethodElement.kt
index 357fe16..02384a9 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XMethodElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMethodElement.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * Represents a method in a class / interface.
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XMethodType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMethodType.kt
similarity index 96%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XMethodType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMethodType.kt
index 8d5ede4..92a0208 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XMethodType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XMethodType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 import com.squareup.javapoet.TypeVariableName
 
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XNullability.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XNullability.kt
similarity index 96%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XNullability.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XNullability.kt
index 15f2f0c..ae3df43 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XNullability.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XNullability.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * Declares the nullability of a type or element.
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XProcessingEnv.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingEnv.kt
similarity index 96%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XProcessingEnv.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingEnv.kt
index 95a75f4..11858cd 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XProcessingEnv.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingEnv.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.javac.JavacProcessingEnv
+import androidx.room.compiler.processing.javac.JavacProcessingEnv
 import com.squareup.javapoet.TypeName
 import javax.annotation.processing.Filer
 import javax.annotation.processing.ProcessingEnvironment
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XProcessingStep.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingStep.kt
similarity index 95%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XProcessingStep.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingStep.kt
index e3ef8a8..17aff096 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XProcessingStep.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XProcessingStep.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.javac.JavacElement
-import androidx.room.processing.javac.JavacProcessingEnv
+import androidx.room.compiler.processing.javac.JavacElement
+import androidx.room.compiler.processing.javac.JavacProcessingEnv
 import com.google.auto.common.BasicAnnotationProcessor
 import com.google.auto.common.MoreElements
 import com.google.common.collect.SetMultimap
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XRoundEnv.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XRoundEnv.kt
similarity index 89%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XRoundEnv.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XRoundEnv.kt
index e74b02b1..8cb97c9 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XRoundEnv.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XRoundEnv.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 import androidx.annotation.VisibleForTesting
-import androidx.room.processing.javac.JavacProcessingEnv
-import androidx.room.processing.javac.JavacRoundEnv
+import androidx.room.compiler.processing.javac.JavacProcessingEnv
+import androidx.room.compiler.processing.javac.JavacRoundEnv
 import javax.annotation.processing.RoundEnvironment
 
 /**
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XType.kt
similarity index 99%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XType.kt
index 2fb1179..0327c77 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 import com.squareup.javapoet.TypeName
 import kotlin.contracts.contract
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XTypeElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XTypeElement.kt
similarity index 98%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XTypeElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XTypeElement.kt
index 230787d..7c7cb1b 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XTypeElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XTypeElement.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 import com.squareup.javapoet.ClassName
 
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XVariableElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XVariableElement.kt
similarity index 95%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/XVariableElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/XVariableElement.kt
index 5e423a5..572dcf6 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/XVariableElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/XVariableElement.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
 /**
  * Represents a variable element, that is either a method parameter or a field.
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/DefaultJavacType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/DefaultJavacType.kt
similarity index 94%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/DefaultJavacType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/DefaultJavacType.kt
index af56602..4c000f0 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/DefaultJavacType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/DefaultJavacType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
 import javax.lang.model.type.TypeMirror
 
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/ElementExt.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/ElementExt.kt
similarity index 96%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/ElementExt.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/ElementExt.kt
index 4ff1abe..2f73285 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/ElementExt.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/ElementExt.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
 import com.google.auto.common.MoreTypes
 import javax.lang.model.element.TypeElement
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacAnnotationBox.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacAnnotationBox.kt
similarity index 98%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacAnnotationBox.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacAnnotationBox.kt
index 06e1dda..0b01a4c5 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacAnnotationBox.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacAnnotationBox.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XAnnotationBox
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XAnnotationBox
+import androidx.room.compiler.processing.XType
 import com.google.auto.common.AnnotationMirrors
 import java.lang.reflect.Proxy
 import javax.lang.model.element.AnnotationMirror
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacArrayType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacArrayType.kt
similarity index 87%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacArrayType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacArrayType.kt
index 42fe064..6f45b7d 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacArrayType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacArrayType.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XArrayType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XArrayType
+import androidx.room.compiler.processing.XType
 import javax.lang.model.type.ArrayType
 
 internal class JavacArrayType(
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacConstructorElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacConstructorElement.kt
similarity index 90%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacConstructorElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacConstructorElement.kt
index 302eae8..f9a9b1f 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacConstructorElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacConstructorElement.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XConstructorElement
+import androidx.room.compiler.processing.XConstructorElement
 import javax.lang.model.element.ElementKind
 import javax.lang.model.element.ExecutableElement
 
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacDeclaredType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacDeclaredType.kt
similarity index 90%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacDeclaredType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacDeclaredType.kt
index 835bc7d..1082d8f 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacDeclaredType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacDeclaredType.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import javax.lang.model.type.DeclaredType
 
 internal class JavacDeclaredType(
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
similarity index 93%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
index 034e48b..4a8e9cb 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
 import androidx.annotation.NonNull
 import androidx.annotation.Nullable
-import androidx.room.processing.XAnnotationBox
-import androidx.room.processing.XElement
-import androidx.room.processing.XEquality
-import androidx.room.processing.XNullability
+import androidx.room.compiler.processing.XAnnotationBox
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XEquality
+import androidx.room.compiler.processing.XNullability
 import com.google.auto.common.MoreElements
 import java.util.Locale
 import javax.lang.model.element.Element
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacExecutableElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacExecutableElement.kt
similarity index 88%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacExecutableElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacExecutableElement.kt
index 5dda192..258d70b 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacExecutableElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacExecutableElement.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XExecutableElement
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.javac.kotlin.descriptor
+import androidx.room.compiler.processing.XExecutableElement
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.javac.kotlin.descriptor
 import javax.lang.model.element.ExecutableElement
 
 internal abstract class JavacExecutableElement(
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodElement.kt
similarity index 92%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodElement.kt
index 5b971b8..6b7f2f3 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodElement.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XMethodType
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XMethodType
+import androidx.room.compiler.processing.XVariableElement
 import com.google.auto.common.MoreElements
 import com.google.auto.common.MoreTypes
 import javax.lang.model.element.ElementKind
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodParameter.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodParameter.kt
similarity index 94%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodParameter.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodParameter.kt
index afef7ff..c4d36a3 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodParameter.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodParameter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
 import javax.lang.model.element.VariableElement
 
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodType.kt
similarity index 92%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodType.kt
index c6dbf64..4ca51a15 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacMethodType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacMethodType.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XMethodType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XMethodType
+import androidx.room.compiler.processing.XType
 import com.google.auto.common.MoreTypes
 import com.squareup.javapoet.TypeVariableName
 import javax.lang.model.type.ExecutableType
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacProcessingEnv.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacProcessingEnv.kt
similarity index 92%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacProcessingEnv.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacProcessingEnv.kt
index bad4c19..53bb3b6 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacProcessingEnv.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacProcessingEnv.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMessager
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMessager
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
 import com.google.auto.common.GeneratedAnnotations
 import com.google.auto.common.MoreTypes
 import java.util.Locale
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacProcessingEnvMessager.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacProcessingEnvMessager.kt
similarity index 95%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacProcessingEnvMessager.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacProcessingEnvMessager.kt
index dbb0825..8fdeba7 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacProcessingEnvMessager.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacProcessingEnvMessager.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XElement
-import androidx.room.processing.XMessager
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XMessager
 import java.io.StringWriter
 import javax.annotation.processing.ProcessingEnvironment
 import javax.lang.model.element.Element
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacRoundEnv.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacRoundEnv.kt
similarity index 90%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacRoundEnv.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacRoundEnv.kt
index 7ed95ee..5f3ba5e 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacRoundEnv.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacRoundEnv.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XElement
-import androidx.room.processing.XRoundEnv
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XRoundEnv
 import com.google.auto.common.MoreElements
 import javax.annotation.processing.RoundEnvironment
 
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacType.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacType.kt
similarity index 92%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacType.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacType.kt
index 71f094d..da4cf9b 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacType.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacType.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XEquality
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.safeTypeName
+import androidx.room.compiler.processing.XEquality
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.safeTypeName
 import com.google.auto.common.MoreTypes
 import javax.lang.model.type.TypeKind
 import javax.lang.model.type.TypeMirror
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacTypeElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacTypeElement.kt
similarity index 94%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacTypeElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacTypeElement.kt
index 49a4a13..24c70a2 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacTypeElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacTypeElement.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.XVariableElement
-import androidx.room.processing.javac.kotlin.KotlinMetadataElement
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.XVariableElement
+import androidx.room.compiler.processing.javac.kotlin.KotlinMetadataElement
 import com.google.auto.common.MoreElements
 import com.squareup.javapoet.ClassName
 import javax.lang.model.element.ElementKind
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacVariableElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacVariableElement.kt
similarity index 87%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacVariableElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacVariableElement.kt
index 4c5aee9..84fe021 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/JavacVariableElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacVariableElement.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XVariableElement
 import com.google.auto.common.MoreTypes
 import javax.lang.model.element.VariableElement
 
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/XTypeElementStore.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/XTypeElementStore.kt
similarity index 93%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/XTypeElementStore.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/XTypeElementStore.kt
index 37ecd47..229951e 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/XTypeElementStore.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/XTypeElementStore.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac
+package androidx.room.compiler.processing.javac
 
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XTypeElement
 import java.lang.ref.WeakReference
 
 /**
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/JvmDescriptorUtils.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/JvmDescriptorUtils.kt
similarity index 98%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/JvmDescriptorUtils.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/JvmDescriptorUtils.kt
index cabec27..2105173 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/JvmDescriptorUtils.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/JvmDescriptorUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac.kotlin
+package androidx.room.compiler.processing.javac.kotlin
 
 import com.google.auto.common.MoreTypes
 import javax.lang.model.element.Element
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/KotlinClassMetadataUtils.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/KotlinClassMetadataUtils.kt
similarity index 98%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/KotlinClassMetadataUtils.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/KotlinClassMetadataUtils.kt
index fefd8e0..c480af1 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/KotlinClassMetadataUtils.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/KotlinClassMetadataUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac.kotlin
+package androidx.room.compiler.processing.javac.kotlin
 
 import kotlinx.metadata.ClassName
 import kotlinx.metadata.Flag
diff --git a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/KotlinMetadataElement.kt b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/KotlinMetadataElement.kt
similarity index 98%
rename from room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/KotlinMetadataElement.kt
rename to room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/KotlinMetadataElement.kt
index 5e822a2..8458e29 100644
--- a/room/compiler-xprocessing/src/main/java/androidx/room/processing/javac/kotlin/KotlinMetadataElement.kt
+++ b/room/compiler-processing/src/main/java/androidx/room/compiler/processing/javac/kotlin/KotlinMetadataElement.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac.kotlin
+package androidx.room.compiler.processing.javac.kotlin
 
 import kotlinx.metadata.jvm.KotlinClassHeader
 import kotlinx.metadata.jvm.KotlinClassMetadata
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/JavacTestProcessorTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/JavacTestProcessorTest.kt
similarity index 87%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/JavacTestProcessorTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/JavacTestProcessorTest.kt
index 7a48e00..77a5524 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/JavacTestProcessorTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/JavacTestProcessorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.testcode.OtherAnnotation
-import androidx.room.processing.util.Source
+import androidx.room.compiler.processing.testcode.OtherAnnotation
+import androidx.room.compiler.processing.util.Source
 import com.google.common.truth.Truth.assertAbout
 import com.google.common.truth.Truth.assertThat
 import com.google.testing.compile.JavaSourcesSubjectFactory
@@ -30,7 +30,7 @@
         val source = Source.java(
             "foo.bar.Baz", """
             package foo.bar;
-            import androidx.room.processing.testcode.OtherAnnotation;
+            import androidx.room.compiler.processing.testcode.OtherAnnotation;
             @OtherAnnotation(value="xx")
             class Baz {
             }
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/KotlinMetadataTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/KotlinMetadataTest.kt
similarity index 77%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/KotlinMetadataTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/KotlinMetadataTest.kt
index 8e0df4d..8860ab3 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/KotlinMetadataTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/KotlinMetadataTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.testcode.KotlinTestClass
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.getMethod
-import androidx.room.processing.util.getParameter
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.testcode.KotlinTestClass
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.getMethod
+import androidx.room.compiler.processing.util.getParameter
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.common.truth.Truth.assertThat
 import com.squareup.javapoet.TypeName
 import org.junit.Test
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/MethodSpecHelperTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/MethodSpecHelperTest.kt
similarity index 94%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/MethodSpecHelperTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/MethodSpecHelperTest.kt
index 049e047..fe82178 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/MethodSpecHelperTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/MethodSpecHelperTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.auto.common.MoreTypes
 import com.google.common.truth.Truth.assertAbout
 import com.google.common.truth.Truth.assertThat
@@ -41,7 +41,7 @@
         val source = Source.java(
             "foo.bar.Baz", """
             package foo.bar;
-            import androidx.room.processing.testcode.OtherAnnotation;
+            import androidx.room.compiler.processing.testcode.OtherAnnotation;
 
             public class Baz {
                 public void method1() {
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/SyntheticJavacProcessor.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/SyntheticJavacProcessor.kt
similarity index 86%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/SyntheticJavacProcessor.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/SyntheticJavacProcessor.kt
index cfb3526..0541bfc 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/SyntheticJavacProcessor.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/SyntheticJavacProcessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.javac.JavacProcessingEnv
-import androidx.room.processing.util.TestInvocation
+import androidx.room.compiler.processing.javac.JavacProcessingEnv
+import androidx.room.compiler.processing.util.TestInvocation
 import javax.lang.model.SourceVersion
 
 class SyntheticJavacProcessor(
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/TypeAssignmentTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/TypeAssignmentTest.kt
similarity index 91%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/TypeAssignmentTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/TypeAssignmentTest.kt
index 5856a38..eb84e72 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/TypeAssignmentTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/TypeAssignmentTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.TestInvocation
-import androidx.room.processing.util.getField
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.TestInvocation
+import androidx.room.compiler.processing.util.getField
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XAnnotationBoxTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XAnnotationBoxTest.kt
similarity index 87%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/XAnnotationBoxTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/XAnnotationBoxTest.kt
index 62d76f7..3d8a483 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XAnnotationBoxTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XAnnotationBoxTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.testcode.MainAnnotation
-import androidx.room.processing.testcode.OtherAnnotation
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.testcode.MainAnnotation
+import androidx.room.compiler.processing.testcode.OtherAnnotation
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -56,8 +56,8 @@
         val mySource = Source.java(
             "foo.bar.Baz", """
             package foo.bar;
-            import androidx.room.processing.testcode.MainAnnotation;
-            import androidx.room.processing.testcode.OtherAnnotation;
+            import androidx.room.compiler.processing.testcode.MainAnnotation;
+            import androidx.room.compiler.processing.testcode.OtherAnnotation;
             @MainAnnotation(
                 typeList = {String.class, Integer.class},
                 singleType = Long.class,
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XArrayTypeTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XArrayTypeTest.kt
similarity index 88%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/XArrayTypeTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/XArrayTypeTest.kt
index 9544160..13a1dc4 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XArrayTypeTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XArrayTypeTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.getField
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.getField
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.common.truth.Truth.assertThat
 import com.squareup.javapoet.ArrayTypeName
 import com.squareup.javapoet.TypeName
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XElementTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XElementTest.kt
similarity index 95%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/XElementTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/XElementTest.kt
index 6146905..2765b4b 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XElementTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XElementTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.testcode.OtherAnnotation
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.getField
-import androidx.room.processing.util.getMethod
-import androidx.room.processing.util.getParameter
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.testcode.OtherAnnotation
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.getField
+import androidx.room.compiler.processing.util.getMethod
+import androidx.room.compiler.processing.util.getParameter
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.common.truth.Truth.assertThat
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.TypeName
@@ -187,7 +187,7 @@
             import org.junit.*;
             import org.junit.runner.*;
             import org.junit.runners.*;
-            import androidx.room.processing.testcode.OtherAnnotation;
+            import androidx.room.compiler.processing.testcode.OtherAnnotation;
 
             @RunWith(JUnit4.class)
             class Baz {
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XExecutableElementTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XExecutableElementTest.kt
similarity index 93%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/XExecutableElementTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/XExecutableElementTest.kt
index 4181d68..8eba815 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XExecutableElementTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XExecutableElementTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.getDeclaredMethod
-import androidx.room.processing.util.getMethod
-import androidx.room.processing.util.getParameter
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.getDeclaredMethod
+import androidx.room.compiler.processing.util.getMethod
+import androidx.room.compiler.processing.util.getParameter
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.common.truth.Truth.assertThat
 import com.squareup.javapoet.TypeName
 import org.junit.Test
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XProcessingEnvTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingEnvTest.kt
similarity index 95%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/XProcessingEnvTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingEnvTest.kt
index 7305f37..69dec8e 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XProcessingEnvTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingEnvTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.common.truth.Truth.assertThat
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.TypeName
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XProcessingStepTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingStepTest.kt
similarity index 94%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/XProcessingStepTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingStepTest.kt
index b75f9be..fb0a810 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XProcessingStepTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XProcessingStepTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.testcode.MainAnnotation
-import androidx.room.processing.testcode.OtherAnnotation
+import androidx.room.compiler.processing.testcode.MainAnnotation
+import androidx.room.compiler.processing.testcode.OtherAnnotation
 import com.google.auto.common.BasicAnnotationProcessor
 import com.google.common.truth.Truth.assertAbout
 import com.google.common.truth.Truth.assertThat
@@ -63,7 +63,7 @@
         val main = JavaFileObjects.forSourceString(
             "foo.bar.Main", """
             package foo.bar;
-            import androidx.room.processing.testcode.*;
+            import androidx.room.compiler.processing.testcode.*;
             @MainAnnotation(
                 typeList = {},
                 singleType = Object.class,
@@ -77,7 +77,7 @@
         val other = JavaFileObjects.forSourceString(
             "foo.bar.Other", """
             package foo.bar;
-            import androidx.room.processing.testcode.*;
+            import androidx.room.compiler.processing.testcode.*;
             @OtherAnnotation("x")
             class Other {
             }
@@ -133,7 +133,7 @@
         val main = JavaFileObjects.forSourceString(
             "foo.bar.Main", """
             package foo.bar;
-            import androidx.room.processing.testcode.*;
+            import androidx.room.compiler.processing.testcode.*;
             @MainAnnotation(
                 typeList = {},
                 singleType = Object.class,
@@ -205,7 +205,7 @@
         val main = JavaFileObjects.forSourceString(
             "foo.bar.Main", """
             package foo.bar;
-            import androidx.room.processing.testcode.*;
+            import androidx.room.compiler.processing.testcode.*;
             @MainAnnotation(
                 typeList = {},
                 singleType = Object.class,
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XTypeTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XTypeTest.kt
similarity index 93%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/XTypeTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/XTypeTest.kt
index 9ef38f7..1ab4440 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/XTypeTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/XTypeTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package androidx.room.processing
+package androidx.room.compiler.processing
 
-import androidx.room.processing.util.Source
-import androidx.room.processing.util.getDeclaredMethod
-import androidx.room.processing.util.getField
-import androidx.room.processing.util.getMethod
-import androidx.room.processing.util.runProcessorTest
-import androidx.room.processing.util.runProcessorTestForFailedCompilation
+import androidx.room.compiler.processing.util.Source
+import androidx.room.compiler.processing.util.getDeclaredMethod
+import androidx.room.compiler.processing.util.getField
+import androidx.room.compiler.processing.util.getMethod
+import androidx.room.compiler.processing.util.runProcessorTest
+import androidx.room.compiler.processing.util.runProcessorTestForFailedCompilation
 import com.google.common.truth.Truth.assertThat
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.ParameterizedTypeName
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/javac/kotlin/JvmDescriptorUtilsTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/javac/kotlin/JvmDescriptorUtilsTest.kt
similarity index 99%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/javac/kotlin/JvmDescriptorUtilsTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/javac/kotlin/JvmDescriptorUtilsTest.kt
index 4bb6c67..0534136 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/javac/kotlin/JvmDescriptorUtilsTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/javac/kotlin/JvmDescriptorUtilsTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac.kotlin
+package androidx.room.compiler.processing.javac.kotlin
 
 import com.google.auto.common.MoreElements
 import com.google.common.truth.Truth
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/javac/kotlin/KotlinMetadataElementTest.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/javac/kotlin/KotlinMetadataElementTest.kt
similarity index 95%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/javac/kotlin/KotlinMetadataElementTest.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/javac/kotlin/KotlinMetadataElementTest.kt
index d60932e..839a719 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/javac/kotlin/KotlinMetadataElementTest.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/javac/kotlin/KotlinMetadataElementTest.kt
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.javac.kotlin
+package androidx.room.compiler.processing.javac.kotlin
 
-import androidx.room.processing.javac.JavacProcessingEnv
-import androidx.room.processing.util.runProcessorTest
+import androidx.room.compiler.processing.javac.JavacProcessingEnv
+import androidx.room.compiler.processing.util.runProcessorTest
 import com.google.common.truth.Truth.assertThat
 import org.junit.AssumptionViolatedException
 import org.junit.Test
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/KotlinTestClass.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/KotlinTestClass.kt
similarity index 88%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/KotlinTestClass.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/KotlinTestClass.kt
index b3b17a7..f3c6f5e 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/KotlinTestClass.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/KotlinTestClass.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 @file:Suppress("unused")
 
-package androidx.room.processing.testcode
+package androidx.room.compiler.processing.testcode
 
 @Suppress("UNUSED_PARAMETER", "RedundantSuspendModifier")
 class KotlinTestClass {
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/MainAnnotation.java b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/MainAnnotation.java
similarity index 91%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/MainAnnotation.java
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/MainAnnotation.java
index f587f46..9ba12cf 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/MainAnnotation.java
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/MainAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.testcode;
+package androidx.room.compiler.processing.testcode;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/OtherAnnotation.java b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/OtherAnnotation.java
similarity index 88%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/OtherAnnotation.java
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/OtherAnnotation.java
index e1468e5..cc63acd 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/testcode/OtherAnnotation.java
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/testcode/OtherAnnotation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.testcode;
+package androidx.room.compiler.processing.testcode;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/util/ProcessorTestExt.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/ProcessorTestExt.kt
similarity index 95%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/util/ProcessorTestExt.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/ProcessorTestExt.kt
index 2044072..dbfa26b 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/util/ProcessorTestExt.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/ProcessorTestExt.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.util
+package androidx.room.compiler.processing.util
 
-import androidx.room.processing.SyntheticJavacProcessor
+import androidx.room.compiler.processing.SyntheticJavacProcessor
 import com.google.common.truth.Truth
 import com.google.testing.compile.CompileTester
 import com.google.testing.compile.JavaSourcesSubjectFactory
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/util/Source.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/Source.kt
similarity index 95%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/util/Source.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/Source.kt
index 868f4ba..778b6b8 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/util/Source.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/Source.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.util
+package androidx.room.compiler.processing.util
 
 import com.google.testing.compile.JavaFileObjects
 import com.tschuchort.compiletesting.SourceFile
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/util/TestExtensions.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/TestExtensions.kt
similarity index 84%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/util/TestExtensions.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/TestExtensions.kt
index 22e2859..ef3de1a 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/util/TestExtensions.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/TestExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.util
+package androidx.room.compiler.processing.util
 
-import androidx.room.processing.XExecutableElement
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XExecutableElement
+import androidx.room.compiler.processing.XTypeElement
 
 fun XTypeElement.getField(name: String) = getAllFieldsIncludingPrivateSupers().first {
     it.name == name
diff --git a/room/compiler-xprocessing/src/test/java/androidx/room/processing/util/TestInvocation.kt b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/TestInvocation.kt
similarity index 80%
rename from room/compiler-xprocessing/src/test/java/androidx/room/processing/util/TestInvocation.kt
rename to room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/TestInvocation.kt
index ab1f69e..95e4ead 100644
--- a/room/compiler-xprocessing/src/test/java/androidx/room/processing/util/TestInvocation.kt
+++ b/room/compiler-processing/src/test/java/androidx/room/compiler/processing/util/TestInvocation.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package androidx.room.processing.util
+package androidx.room.compiler.processing.util
 
-import androidx.room.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingEnv
 
 class TestInvocation(
     val processingEnv: XProcessingEnv
diff --git a/room/compiler/build.gradle b/room/compiler/build.gradle
index e4354f6..cb91306 100644
--- a/room/compiler/build.gradle
+++ b/room/compiler/build.gradle
@@ -105,7 +105,7 @@
 dependencies {
     implementation(project(":room:room-common"))
     implementation(project(":room:room-migration"))
-    implementation(project(":room:room-compiler-xprocessing"))
+    implementation(project(":room:room-compiler-processing"))
     implementation(KOTLIN_STDLIB)
     implementation(AUTO_COMMON)
     implementation(AUTO_VALUE_ANNOTATIONS)
diff --git a/room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt b/room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt
index 1f54d69..7ed2149d 100644
--- a/room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/DatabaseProcessingStep.kt
@@ -16,9 +16,9 @@
 
 package androidx.room
 
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.XProcessingStep
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingStep
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.processor.Context
 import androidx.room.processor.DatabaseProcessor
 import androidx.room.processor.MissingTypeException
diff --git a/room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt
index aefbcf1..9e9d455 100644
--- a/room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/RoomProcessor.kt
@@ -16,7 +16,7 @@
 
 package androidx.room
 
-import androidx.room.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingEnv
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.util.SimpleJavaVersion
diff --git a/room/compiler/src/main/kotlin/androidx/room/ext/xelement_ext.kt b/room/compiler/src/main/kotlin/androidx/room/ext/xelement_ext.kt
index ff3928b..487bafc 100644
--- a/room/compiler/src/main/kotlin/androidx/room/ext/xelement_ext.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/ext/xelement_ext.kt
@@ -16,9 +16,9 @@
 
 package androidx.room.ext
 
-import androidx.room.processing.XElement
-import androidx.room.processing.XTypeElement
 import kotlin.contracts.contract
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XTypeElement
 
 fun XElement.isEntityElement(): Boolean {
     contract {
diff --git a/room/compiler/src/main/kotlin/androidx/room/log/RLog.kt b/room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
index c1433aa..b7575e6 100644
--- a/room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/log/RLog.kt
@@ -18,8 +18,8 @@
 
 package androidx.room.log
 
-import androidx.room.processing.XElement
-import androidx.room.processing.XMessager
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XMessager
 import androidx.room.processor.Context
 import androidx.room.vo.Warning
 import javax.tools.Diagnostic
diff --git a/room/compiler/src/main/kotlin/androidx/room/parser/SqlParser.kt b/room/compiler/src/main/kotlin/androidx/room/parser/SqlParser.kt
index 494dfd6..3dff9a7 100644
--- a/room/compiler/src/main/kotlin/androidx/room/parser/SqlParser.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/parser/SqlParser.kt
@@ -17,8 +17,8 @@
 package androidx.room.parser
 
 import androidx.room.ColumnInfo
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.XType
 import com.squareup.javapoet.TypeName
 import org.antlr.v4.runtime.tree.ParseTree
 import org.antlr.v4.runtime.tree.TerminalNode
diff --git a/room/compiler/src/main/kotlin/androidx/room/preconditions/Checks.kt b/room/compiler/src/main/kotlin/androidx/room/preconditions/Checks.kt
index 9d65c60..2371d29 100644
--- a/room/compiler/src/main/kotlin/androidx/room/preconditions/Checks.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/preconditions/Checks.kt
@@ -17,7 +17,7 @@
 package androidx.room.preconditions
 
 import androidx.room.log.RLog
-import androidx.room.processing.XElement
+import androidx.room.compiler.processing.XElement
 import com.squareup.javapoet.ParameterizedTypeName
 import com.squareup.javapoet.TypeName
 import com.squareup.javapoet.TypeVariableName
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/Context.kt b/room/compiler/src/main/kotlin/androidx/room/processor/Context.kt
index b9649db..b30f994 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/Context.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/Context.kt
@@ -21,9 +21,9 @@
 import androidx.room.parser.expansion.ProjectionExpander
 import androidx.room.parser.optimization.RemoveUnusedColumnQueryRewriter
 import androidx.room.preconditions.Checks
-import androidx.room.processing.XElement
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.cache.Cache
 import androidx.room.solver.TypeAdapterStore
 import androidx.room.verifier.DatabaseVerifier
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt
index 8a509c5..849710e 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/CustomConverterProcessor.kt
@@ -18,11 +18,11 @@
 
 import androidx.room.TypeConverter
 import androidx.room.TypeConverters
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XElement
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.processor.ProcessorErrors.TYPE_CONVERTER_BAD_RETURN_TYPE
 import androidx.room.processor.ProcessorErrors.TYPE_CONVERTER_EMPTY_CLASS
 import androidx.room.processor.ProcessorErrors.TYPE_CONVERTER_MISSING_NOARG_CONSTRUCTOR
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/DaoProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/DaoProcessor.kt
index db6bf1a..5ed1bf2 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/DaoProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/DaoProcessor.kt
@@ -23,9 +23,9 @@
 import androidx.room.SkipQueryVerification
 import androidx.room.Transaction
 import androidx.room.Update
-import androidx.room.processing.XConstructorElement
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XConstructorElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.verifier.DatabaseVerifier
 import androidx.room.vo.Dao
 import androidx.room.vo.KotlinDefaultMethodDelegate
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt
index 20a502e..75c6368 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseProcessor.kt
@@ -18,11 +18,11 @@
 
 import androidx.room.SkipQueryVerification
 import androidx.room.ext.RoomTypeNames
-import androidx.room.processing.XAnnotationBox
-import androidx.room.processing.XElement
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.isType
+import androidx.room.compiler.processing.XAnnotationBox
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.isType
 import androidx.room.verifier.DatabaseVerificationErrors
 import androidx.room.verifier.DatabaseVerifier
 import androidx.room.vo.Dao
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt
index a18cb90..6654144 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/DatabaseViewProcessor.kt
@@ -19,7 +19,7 @@
 import androidx.room.parser.ParsedQuery
 import androidx.room.parser.QueryType
 import androidx.room.parser.SqlParser
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.vo.DatabaseView
 
 class DatabaseViewProcessor(
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/DeletionMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/DeletionMethodProcessor.kt
index 592345c..395c10a 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/DeletionMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/DeletionMethodProcessor.kt
@@ -16,8 +16,8 @@
 package androidx.room.processor
 
 import androidx.room.Delete
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.vo.DeletionMethod
 
 class DeletionMethodProcessor(
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/EntityOrViewProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/EntityOrViewProcessor.kt
index 002e5029..de0ba64 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/EntityOrViewProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/EntityOrViewProcessor.kt
@@ -18,7 +18,7 @@
 
 import androidx.room.DatabaseView
 import androidx.room.Entity
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.vo.EntityOrView
 import androidx.room.vo.Fields
 import com.squareup.javapoet.TypeName
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/EntityProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/EntityProcessor.kt
index 95577a8..d6d9a17 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/EntityProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/EntityProcessor.kt
@@ -20,9 +20,9 @@
 import androidx.room.ForeignKey
 import androidx.room.Fts3
 import androidx.room.Fts4
-import androidx.room.processing.XAnnotationBox
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XAnnotationBox
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.vo.ForeignKeyAction
 import androidx.room.vo.Index
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt
index 227048f..1081324 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/FieldProcessor.kt
@@ -19,8 +19,8 @@
 import androidx.room.ColumnInfo
 import androidx.room.parser.Collate
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.vo.EmbeddedField
 import androidx.room.vo.Field
 import java.util.Locale
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt
index e35ef3e..796e832 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/FtsTableEntityProcessor.kt
@@ -22,9 +22,9 @@
 import androidx.room.FtsOptions.Order
 import androidx.room.parser.FtsVersion
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XAnnotationBox
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XAnnotationBox
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.processor.EntityProcessor.Companion.extractForeignKeys
 import androidx.room.processor.EntityProcessor.Companion.extractIndices
 import androidx.room.processor.EntityProcessor.Companion.extractTableName
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/InsertionMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/InsertionMethodProcessor.kt
index 2dbaa99..72dd2d0 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/InsertionMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/InsertionMethodProcessor.kt
@@ -21,8 +21,8 @@
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.IGNORE
 import androidx.room.OnConflictStrategy.REPLACE
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.vo.InsertionMethod
 import androidx.room.vo.findFieldByColumnName
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/MethodProcessorDelegate.kt b/room/compiler/src/main/kotlin/androidx/room/processor/MethodProcessorDelegate.kt
index cebb293..755250b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/MethodProcessorDelegate.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/MethodProcessorDelegate.kt
@@ -22,10 +22,10 @@
 import androidx.room.ext.RoomCoroutinesTypeNames
 import androidx.room.ext.T
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.solver.prepared.binder.CallablePreparedQueryResultBinder.Companion.createPreparedBinder
 import androidx.room.solver.prepared.binder.PreparedQueryResultBinder
 import androidx.room.solver.query.result.CoroutineResultBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/PojoMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/PojoMethodProcessor.kt
index 43c708a..34a2ced 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/PojoMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/PojoMethodProcessor.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.processor
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.vo.PojoMethod
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt
index a1ffaa7..774c895 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/PojoProcessor.kt
@@ -22,13 +22,13 @@
 import androidx.room.Junction
 import androidx.room.PrimaryKey
 import androidx.room.Relation
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XExecutableElement
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.XVariableElement
-import androidx.room.processing.asDeclaredType
-import androidx.room.processing.isCollection
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XExecutableElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.XVariableElement
+import androidx.room.compiler.processing.asDeclaredType
+import androidx.room.compiler.processing.isCollection
 import androidx.room.processor.ProcessorErrors.CANNOT_FIND_GETTER_FOR_FIELD
 import androidx.room.processor.ProcessorErrors.CANNOT_FIND_SETTER_FOR_FIELD
 import androidx.room.processor.ProcessorErrors.POJO_FIELD_HAS_DUPLICATE_COLUMN_NAME
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
index 8aad153..88bbb26 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/QueryMethodProcessor.kt
@@ -22,9 +22,9 @@
 import androidx.room.parser.ParsedQuery
 import androidx.room.parser.QueryType
 import androidx.room.parser.SqlParser
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.query.result.PojoRowAdapter
 import androidx.room.verifier.DatabaseVerificationErrors
 import androidx.room.verifier.DatabaseVerifier
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/QueryParameterProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/QueryParameterProcessor.kt
index 45ecebc..4591d69 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/QueryParameterProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/QueryParameterProcessor.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.processor
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.vo.QueryParameter
 
 class QueryParameterProcessor(
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt
index c177f63..e1ed550 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/RawQueryMethodProcessor.kt
@@ -21,9 +21,9 @@
 import androidx.room.ext.SupportDbTypeNames
 import androidx.room.ext.isEntityElement
 import androidx.room.parser.SqlParser
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.processor.ProcessorErrors.RAW_QUERY_STRING_PARAMETER_REMOVED
 import androidx.room.vo.RawQueryMethod
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt
index 66955d6..50e0fcd 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutMethodProcessor.kt
@@ -16,11 +16,11 @@
 package androidx.room.processor
 
 import androidx.room.ext.isEntityElement
-import androidx.room.processing.XAnnotationBox
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XAnnotationBox
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.vo.Entity
 import androidx.room.vo.Pojo
 import androidx.room.vo.ShortcutEntity
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutParameterProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutParameterProcessor.kt
index 310dcb8..9424867 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutParameterProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/ShortcutParameterProcessor.kt
@@ -16,11 +16,11 @@
 
 package androidx.room.processor
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
-import androidx.room.processing.XVariableElement
-import androidx.room.processing.asDeclaredType
-import androidx.room.processing.isArray
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XVariableElement
+import androidx.room.compiler.processing.asDeclaredType
+import androidx.room.compiler.processing.isArray
 import androidx.room.vo.ShortcutQueryParameter
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt
index 70f2ecd..390b8bd 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/SuppressWarningProcessor.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.processor
 
-import androidx.room.processing.XElement
+import androidx.room.compiler.processing.XElement
 import androidx.room.vo.Warning
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt
index f8ac9e7..f66dcc6 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/TableEntityProcessor.kt
@@ -18,8 +18,8 @@
 
 import androidx.room.parser.SQLTypeAffinity
 import androidx.room.parser.SqlParser
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.processor.EntityProcessor.Companion.createIndexName
 import androidx.room.processor.EntityProcessor.Companion.extractForeignKeys
 import androidx.room.processor.EntityProcessor.Companion.extractIndices
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/TransactionMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/TransactionMethodProcessor.kt
index 8a4cd01..037db08 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/TransactionMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/TransactionMethodProcessor.kt
@@ -20,8 +20,8 @@
 import androidx.room.ext.LifecyclesTypeNames
 import androidx.room.ext.RxJava2TypeNames
 import androidx.room.ext.RxJava3TypeNames
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.vo.TransactionMethod
 
 class TransactionMethodProcessor(
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/UpdateMethodProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/processor/UpdateMethodProcessor.kt
index 79a4a67..7f08df9 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/UpdateMethodProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/UpdateMethodProcessor.kt
@@ -19,8 +19,8 @@
 import androidx.room.OnConflictStrategy.IGNORE
 import androidx.room.OnConflictStrategy.REPLACE
 import androidx.room.Update
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.vo.UpdateMethod
 import androidx.room.vo.findFieldByColumnName
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/autovalue/AutoValuePojoProcessorDelegate.kt b/room/compiler/src/main/kotlin/androidx/room/processor/autovalue/AutoValuePojoProcessorDelegate.kt
index 1e0dab2..16c9c05 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/autovalue/AutoValuePojoProcessorDelegate.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/autovalue/AutoValuePojoProcessorDelegate.kt
@@ -17,10 +17,10 @@
 package androidx.room.processor.autovalue
 
 import androidx.room.Ignore
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XExecutableElement
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.isType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XExecutableElement
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.isType
 import androidx.room.processor.Context
 import androidx.room.processor.PojoProcessor
 import androidx.room.processor.PojoProcessor.Companion.TARGET_METHOD_ANNOTATIONS
diff --git a/room/compiler/src/main/kotlin/androidx/room/processor/cache/Cache.kt b/room/compiler/src/main/kotlin/androidx/room/processor/cache/Cache.kt
index 16b9ab3..fee6e5c 100644
--- a/room/compiler/src/main/kotlin/androidx/room/processor/cache/Cache.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/processor/cache/Cache.kt
@@ -18,8 +18,8 @@
 
 package androidx.room.processor.cache
 
-import androidx.room.processing.XElement
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.FieldProcessor
 import androidx.room.vo.EmbeddedField
 import androidx.room.vo.Entity
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/KotlinDefaultMethodDelegateBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/KotlinDefaultMethodDelegateBinder.kt
index 87e668f..1a6334b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/KotlinDefaultMethodDelegateBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/KotlinDefaultMethodDelegateBinder.kt
@@ -20,7 +20,7 @@
 import androidx.room.ext.L
 import androidx.room.ext.N
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import com.squareup.javapoet.ClassName
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/ObservableQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/ObservableQueryResultBinderProvider.kt
index 159bf397..44397c2 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/ObservableQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/ObservableQueryResultBinderProvider.kt
@@ -17,8 +17,8 @@
 package androidx.room.solver
 
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.query.result.QueryResultAdapter
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/QueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/QueryResultBinderProvider.kt
index 8290d7a..a3f125b3 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/QueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/QueryResultBinderProvider.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver
 
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.solver.query.result.QueryResultBinder
 
 interface QueryResultBinderProvider {
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt b/room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
index 740806b..c82aac1 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/TypeAdapterStore.kt
@@ -21,10 +21,10 @@
 import androidx.room.ext.isEntityElement
 import androidx.room.parser.ParsedQuery
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XType
-import androidx.room.processing.asDeclaredType
-import androidx.room.processing.isArray
-import androidx.room.processing.isDeclared
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.asDeclaredType
+import androidx.room.compiler.processing.isArray
+import androidx.room.compiler.processing.isDeclared
 import androidx.room.processor.Context
 import androidx.room.processor.EntityProcessor
 import androidx.room.processor.FieldProcessor
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/CoroutineFlowResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/CoroutineFlowResultBinderProvider.kt
index 286d620..6c21655 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/CoroutineFlowResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/CoroutineFlowResultBinderProvider.kt
@@ -19,7 +19,7 @@
 import androidx.room.ext.KotlinTypeNames
 import androidx.room.ext.RoomCoroutinesTypeNames
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.QueryResultBinderProvider
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/CursorQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/CursorQueryResultBinderProvider.kt
index 6e08b73..e645fd8 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/CursorQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/CursorQueryResultBinderProvider.kt
@@ -18,7 +18,7 @@
 
 import androidx.room.ext.AndroidTypeNames
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.solver.QueryResultBinderProvider
 import androidx.room.solver.query.result.CursorQueryResultBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/DataSourceFactoryQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/DataSourceFactoryQueryResultBinderProvider.kt
index bf79b16..4875dae 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/DataSourceFactoryQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/DataSourceFactoryQueryResultBinderProvider.kt
@@ -18,8 +18,8 @@
 
 import androidx.room.ext.PagingTypeNames
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.QueryResultBinderProvider
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/DataSourceQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/DataSourceQueryResultBinderProvider.kt
index b7d5ef12..1ec2f8df 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/DataSourceQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/DataSourceQueryResultBinderProvider.kt
@@ -18,8 +18,8 @@
 
 import androidx.room.ext.PagingTypeNames
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.QueryResultBinderProvider
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/GuavaListenableFutureQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/GuavaListenableFutureQueryResultBinderProvider.kt
index 31aae30..9e611ae 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/GuavaListenableFutureQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/GuavaListenableFutureQueryResultBinderProvider.kt
@@ -19,7 +19,7 @@
 import androidx.room.ext.GuavaUtilConcurrentTypeNames
 import androidx.room.ext.RoomGuavaTypeNames
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.QueryResultBinderProvider
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/InstantQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/InstantQueryResultBinderProvider.kt
index 7e9a40c..6fd94a5 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/InstantQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/InstantQueryResultBinderProvider.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.binderprovider
 
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.solver.QueryResultBinderProvider
 import androidx.room.solver.query.result.InstantQueryResultBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/LiveDataQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/LiveDataQueryResultBinderProvider.kt
index b1cae91..3c48408 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/LiveDataQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/LiveDataQueryResultBinderProvider.kt
@@ -17,8 +17,8 @@
 package androidx.room.solver.binderprovider
 
 import androidx.room.ext.LifecyclesTypeNames
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.solver.ObservableQueryResultBinderProvider
 import androidx.room.solver.query.result.LiveDataQueryResultBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt
index 81053a5..d5b53e1 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/PagingSourceQueryResultBinderProvider.kt
@@ -18,8 +18,8 @@
 
 import androidx.room.ext.PagingTypeNames
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.QueryResultBinderProvider
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/QueryResultBinderProviderWithRequiredArtifact.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/QueryResultBinderProviderWithRequiredArtifact.kt
index 7e39c45..e8400d3 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/QueryResultBinderProviderWithRequiredArtifact.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/QueryResultBinderProviderWithRequiredArtifact.kt
@@ -16,7 +16,7 @@
 package androidx.room.solver.binderprovider
 
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.solver.QueryResultBinderProvider
 import androidx.room.solver.query.result.QueryResultBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxCallableQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxCallableQueryResultBinderProvider.kt
index 278a1aa..9f39121 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxCallableQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxCallableQueryResultBinderProvider.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.binderprovider
 
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.solver.QueryResultBinderProvider
 import androidx.room.solver.RxType
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxQueryResultBinderProvider.kt
index fae68af..da2e1ac 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/binderprovider/RxQueryResultBinderProvider.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.solver.binderprovider
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.solver.ObservableQueryResultBinderProvider
 import androidx.room.solver.RxType
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binder/CallablePreparedQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binder/CallablePreparedQueryResultBinder.kt
index 617dab3..a33abec 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binder/CallablePreparedQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binder/CallablePreparedQueryResultBinder.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.prepared.binder
 
 import androidx.room.ext.CallableTypeSpecBuilder
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.prepared.result.PreparedQueryResultAdapter
 import com.squareup.javapoet.CodeBlock
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/GuavaListenableFuturePreparedQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/GuavaListenableFuturePreparedQueryResultBinderProvider.kt
index 5656cad..b85523c 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/GuavaListenableFuturePreparedQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/GuavaListenableFuturePreparedQueryResultBinderProvider.kt
@@ -22,7 +22,7 @@
 import androidx.room.ext.RoomGuavaTypeNames
 import androidx.room.ext.T
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.prepared.binder.CallablePreparedQueryResultBinder.Companion.createPreparedBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/InstantPreparedQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/InstantPreparedQueryResultBinderProvider.kt
index 2082ac4..8ef7ca67 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/InstantPreparedQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/InstantPreparedQueryResultBinderProvider.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.prepared.binderprovider
 
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.solver.prepared.binder.InstantPreparedQueryResultBinder
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/PreparedQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/PreparedQueryResultBinderProvider.kt
index fd97081..48cd2566 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/PreparedQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/PreparedQueryResultBinderProvider.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.prepared.binderprovider
 
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.solver.prepared.binder.PreparedQueryResultBinder
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/RxPreparedQueryResultBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/RxPreparedQueryResultBinderProvider.kt
index c12bf40..5930155 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/RxPreparedQueryResultBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/binderprovider/RxPreparedQueryResultBinderProvider.kt
@@ -19,8 +19,8 @@
 import androidx.room.ext.L
 import androidx.room.ext.T
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.solver.RxType
 import androidx.room.solver.prepared.binder.CallablePreparedQueryResultBinder.Companion.createPreparedBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/result/PreparedQueryResultAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/result/PreparedQueryResultAdapter.kt
index 4928df3..a60aae1 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/prepared/result/PreparedQueryResultAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/prepared/result/PreparedQueryResultAdapter.kt
@@ -21,7 +21,7 @@
 import androidx.room.ext.N
 import androidx.room.ext.T
 import androidx.room.parser.QueryType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.prepared.binder.PreparedQueryResultBinder
 import com.squareup.javapoet.FieldSpec
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/CoroutineFlowResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/CoroutineFlowResultBinder.kt
index a582db4..77313b2 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/CoroutineFlowResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/CoroutineFlowResultBinder.kt
@@ -22,7 +22,7 @@
 import androidx.room.ext.RoomCoroutinesTypeNames
 import androidx.room.ext.T
 import androidx.room.ext.arrayTypeName
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import com.squareup.javapoet.FieldSpec
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/CoroutineResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/CoroutineResultBinder.kt
index ee02de6..acfab73 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/CoroutineResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/CoroutineResultBinder.kt
@@ -23,7 +23,7 @@
 import androidx.room.ext.RoomCoroutinesTypeNames
 import androidx.room.ext.RoomTypeNames
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import com.squareup.javapoet.FieldSpec
 import com.squareup.javapoet.MethodSpec
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/GuavaListenableFutureQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/GuavaListenableFutureQueryResultBinder.kt
index b181526..34bbc54 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/GuavaListenableFutureQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/GuavaListenableFutureQueryResultBinder.kt
@@ -23,7 +23,7 @@
 import androidx.room.ext.RoomGuavaTypeNames
 import androidx.room.ext.RoomTypeNames
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import com.squareup.javapoet.FieldSpec
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/LiveDataQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/LiveDataQueryResultBinder.kt
index 5aaf677..33e7687 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/LiveDataQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/LiveDataQueryResultBinder.kt
@@ -21,7 +21,7 @@
 import androidx.room.ext.N
 import androidx.room.ext.T
 import androidx.room.ext.arrayTypeName
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import com.squareup.javapoet.FieldSpec
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
index c3ec269..129aa5b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/PojoRowAdapter.kt
@@ -20,7 +20,7 @@
 import androidx.room.ext.RoomTypeNames
 import androidx.room.ext.S
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.CodeGenScope
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RowAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RowAdapter.kt
index 99a89a0..86b03e0 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RowAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RowAdapter.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.solver.query.result
 
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxCallableQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxCallableQueryResultBinder.kt
index 9932e82..07a1160 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxCallableQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxCallableQueryResultBinder.kt
@@ -23,7 +23,7 @@
 import androidx.room.ext.RoomTypeNames
 import androidx.room.ext.S
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.RxType
 import com.squareup.javapoet.FieldSpec
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxQueryResultBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxQueryResultBinder.kt
index 45b862ff..d25051d 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxQueryResultBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/query/result/RxQueryResultBinder.kt
@@ -21,7 +21,7 @@
 import androidx.room.ext.N
 import androidx.room.ext.T
 import androidx.room.ext.arrayTypeName
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.RxType
 import com.squareup.javapoet.FieldSpec
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableDeleteOrUpdateMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableDeleteOrUpdateMethodBinder.kt
index 5b743db5..f7f701e 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableDeleteOrUpdateMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableDeleteOrUpdateMethodBinder.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.shortcut.binder
 
 import androidx.room.ext.CallableTypeSpecBuilder
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.shortcut.result.DeleteOrUpdateMethodAdapter
 import androidx.room.vo.ShortcutQueryParameter
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableInsertMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableInsertMethodBinder.kt
index 8c5d892f..35a5b2d 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableInsertMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binder/CallableInsertMethodBinder.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.shortcut.binder
 
 import androidx.room.ext.CallableTypeSpecBuilder
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.shortcut.result.InsertMethodAdapter
 import androidx.room.vo.ShortcutQueryParameter
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/DeleteOrUpdateMethodBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/DeleteOrUpdateMethodBinderProvider.kt
index 3ed980d..74438c5 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/DeleteOrUpdateMethodBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/DeleteOrUpdateMethodBinderProvider.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.solver.shortcut.binderprovider
 
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.solver.shortcut.binder.DeleteOrUpdateMethodBinder
 import androidx.room.solver.shortcut.result.DeleteOrUpdateMethodAdapter
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/GuavaListenableFutureDeleteOrUpdateMethodBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/GuavaListenableFutureDeleteOrUpdateMethodBinderProvider.kt
index 43b663f..0a22d0b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/GuavaListenableFutureDeleteOrUpdateMethodBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/GuavaListenableFutureDeleteOrUpdateMethodBinderProvider.kt
@@ -21,7 +21,7 @@
 import androidx.room.ext.N
 import androidx.room.ext.RoomGuavaTypeNames
 import androidx.room.ext.T
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.shortcut.binder.CallableDeleteOrUpdateMethodBinder.Companion.createDeleteOrUpdateBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/GuavaListenableFutureInsertMethodBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/GuavaListenableFutureInsertMethodBinderProvider.kt
index 485d138..2f6f68f 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/GuavaListenableFutureInsertMethodBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/GuavaListenableFutureInsertMethodBinderProvider.kt
@@ -21,7 +21,7 @@
 import androidx.room.ext.N
 import androidx.room.ext.RoomGuavaTypeNames
 import androidx.room.ext.T
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.shortcut.binder.CallableInsertMethodBinder.Companion.createInsertBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InsertMethodBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InsertMethodBinderProvider.kt
index 18f77c3..9d99092 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InsertMethodBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InsertMethodBinderProvider.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.solver.shortcut.binderprovider
 
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.solver.shortcut.binder.InsertMethodBinder
 import androidx.room.vo.ShortcutQueryParameter
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InstantDeleteOrUpdateMethodBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InstantDeleteOrUpdateMethodBinderProvider.kt
index 54a4f13..4459d76 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InstantDeleteOrUpdateMethodBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InstantDeleteOrUpdateMethodBinderProvider.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.solver.shortcut.binderprovider
 
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.solver.shortcut.binder.DeleteOrUpdateMethodBinder
 import androidx.room.solver.shortcut.binder.InstantDeleteOrUpdateMethodBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InstantInsertMethodBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InstantInsertMethodBinderProvider.kt
index 2bae5fb..b1f1fb9 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InstantInsertMethodBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/InstantInsertMethodBinderProvider.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.solver.shortcut.binderprovider
 
-import androidx.room.processing.XDeclaredType
+import androidx.room.compiler.processing.XDeclaredType
 import androidx.room.processor.Context
 import androidx.room.solver.shortcut.binder.InsertMethodBinder
 import androidx.room.solver.shortcut.binder.InstantInsertMethodBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/RxCallableDeleteOrUpdateMethodBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/RxCallableDeleteOrUpdateMethodBinderProvider.kt
index 06b58ed..9704d99 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/RxCallableDeleteOrUpdateMethodBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/RxCallableDeleteOrUpdateMethodBinderProvider.kt
@@ -18,8 +18,8 @@
 
 import androidx.room.ext.L
 import androidx.room.ext.T
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.solver.RxType
 import androidx.room.solver.shortcut.binder.CallableDeleteOrUpdateMethodBinder.Companion.createDeleteOrUpdateBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/RxCallableInsertMethodBinderProvider.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/RxCallableInsertMethodBinderProvider.kt
index b3a2a03..535d2bb 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/RxCallableInsertMethodBinderProvider.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/binderprovider/RxCallableInsertMethodBinderProvider.kt
@@ -18,8 +18,8 @@
 
 import androidx.room.ext.L
 import androidx.room.ext.T
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.solver.RxType
 import androidx.room.solver.shortcut.binder.CallableInsertMethodBinder.Companion.createInsertBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/DeleteOrUpdateMethodAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/DeleteOrUpdateMethodAdapter.kt
index 8bf5418..f85ca8c 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/DeleteOrUpdateMethodAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/DeleteOrUpdateMethodAdapter.kt
@@ -20,7 +20,7 @@
 import androidx.room.ext.L
 import androidx.room.ext.N
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.vo.ShortcutQueryParameter
 import com.squareup.javapoet.FieldSpec
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/InsertMethodAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/InsertMethodAdapter.kt
index 4c1dada..2309c5f 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/InsertMethodAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/shortcut/result/InsertMethodAdapter.kt
@@ -21,9 +21,9 @@
 import androidx.room.ext.N
 import androidx.room.ext.T
 import androidx.room.ext.typeName
-import androidx.room.processing.XType
-import androidx.room.processing.asDeclaredType
-import androidx.room.processing.isArray
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.asDeclaredType
+import androidx.room.compiler.processing.isArray
 import androidx.room.solver.CodeGenScope
 import androidx.room.vo.ShortcutQueryParameter
 import com.squareup.javapoet.ArrayTypeName
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/CoroutineTransactionMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/CoroutineTransactionMethodBinder.kt
index 64da959..04fdcc4 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/CoroutineTransactionMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/CoroutineTransactionMethodBinder.kt
@@ -22,7 +22,7 @@
 import androidx.room.ext.N
 import androidx.room.ext.RoomTypeNames.ROOM_DB_KT
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.transaction.result.TransactionMethodAdapter
 import com.squareup.javapoet.ClassName
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/InstantTransactionMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/InstantTransactionMethodBinder.kt
index 9aaef20..df03a98 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/InstantTransactionMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/InstantTransactionMethodBinder.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.transaction.binder
 
 import androidx.room.ext.N
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.transaction.result.TransactionMethodAdapter
 import com.squareup.javapoet.ClassName
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/TransactionMethodBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/TransactionMethodBinder.kt
index f98d436..fb5f27b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/TransactionMethodBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/transaction/binder/TransactionMethodBinder.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.solver.transaction.binder
 
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.transaction.result.TransactionMethodAdapter
 import com.squareup.javapoet.ClassName
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/transaction/result/TransactionMethodAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/transaction/result/TransactionMethodAdapter.kt
index 579c5bd..2811589 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/transaction/result/TransactionMethodAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/transaction/result/TransactionMethodAdapter.kt
@@ -20,7 +20,7 @@
 import androidx.room.ext.L
 import androidx.room.ext.N
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import androidx.room.vo.TransactionMethod
 import com.squareup.javapoet.ClassName
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/BoxedBooleanToBoxedIntConverter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/BoxedBooleanToBoxedIntConverter.kt
index 726cce8..69e3a95 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/BoxedBooleanToBoxedIntConverter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/BoxedBooleanToBoxedIntConverter.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.types
 
 import androidx.room.ext.L
-import androidx.room.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingEnv
 import androidx.room.solver.CodeGenScope
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/BoxedPrimitiveColumnTypeAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/BoxedPrimitiveColumnTypeAdapter.kt
index 646ada5..6fc5cc5 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/BoxedPrimitiveColumnTypeAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/BoxedPrimitiveColumnTypeAdapter.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.types
 
 import androidx.room.ext.L
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/ByteArrayColumnTypeAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/ByteArrayColumnTypeAdapter.kt
index 690c9d1..0e81eb2 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/ByteArrayColumnTypeAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/ByteArrayColumnTypeAdapter.kt
@@ -18,7 +18,7 @@
 
 import androidx.room.ext.L
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingEnv
 import androidx.room.solver.CodeGenScope
 import com.squareup.javapoet.TypeName
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/ByteBufferColumnTypeAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/ByteBufferColumnTypeAdapter.kt
index 8559a33..66a77a1 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/ByteBufferColumnTypeAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/ByteBufferColumnTypeAdapter.kt
@@ -19,7 +19,7 @@
 import androidx.room.ext.L
 import androidx.room.ext.T
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingEnv
 import androidx.room.solver.CodeGenScope
 import com.squareup.javapoet.TypeName
 import java.nio.ByteBuffer
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/ColumnTypeAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/ColumnTypeAdapter.kt
index b9f65cf..9405efc 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/ColumnTypeAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/ColumnTypeAdapter.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.types
 
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import com.squareup.javapoet.TypeName
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/CompositeAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/CompositeAdapter.kt
index b616765..a247135 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/CompositeAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/CompositeAdapter.kt
@@ -18,7 +18,7 @@
 
 import androidx.room.ext.L
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/CursorValueReader.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/CursorValueReader.kt
index c8cd2b9..2e560af 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/CursorValueReader.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/CursorValueReader.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.types
 
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/NoOpConverter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/NoOpConverter.kt
index fad7af7..2c7e651 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/NoOpConverter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/NoOpConverter.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.types
 
 import androidx.room.ext.L
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/PrimitiveBooleanToIntConverter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/PrimitiveBooleanToIntConverter.kt
index bc0d7e1..43cf6b3 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/PrimitiveBooleanToIntConverter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/PrimitiveBooleanToIntConverter.kt
@@ -17,7 +17,7 @@
 package androidx.room.solver.types
 
 import androidx.room.ext.L
-import androidx.room.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingEnv
 import androidx.room.solver.CodeGenScope
 import com.squareup.javapoet.TypeName
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/PrimitiveColumnTypeAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/PrimitiveColumnTypeAdapter.kt
index 3fe4b51..2dc78b2 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/PrimitiveColumnTypeAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/PrimitiveColumnTypeAdapter.kt
@@ -19,8 +19,8 @@
 import androidx.room.ext.L
 import androidx.room.parser.SQLTypeAffinity
 import androidx.room.parser.SQLTypeAffinity.REAL
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 import com.squareup.javapoet.TypeName.BYTE
 import com.squareup.javapoet.TypeName.CHAR
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/StatementValueBinder.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/StatementValueBinder.kt
index f4f9a98..8eb7317 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/StatementValueBinder.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/StatementValueBinder.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.solver.types
 
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/StringColumnTypeAdapter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/StringColumnTypeAdapter.kt
index 67ac944..a741f5d 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/StringColumnTypeAdapter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/StringColumnTypeAdapter.kt
@@ -18,7 +18,7 @@
 
 import androidx.room.ext.L
 import androidx.room.parser.SQLTypeAffinity.TEXT
-import androidx.room.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingEnv
 import androidx.room.solver.CodeGenScope
 
 class StringColumnTypeAdapter(processingEnvironment: XProcessingEnv) :
diff --git a/room/compiler/src/main/kotlin/androidx/room/solver/types/TypeConverter.kt b/room/compiler/src/main/kotlin/androidx/room/solver/types/TypeConverter.kt
index ed5f55c..c03f60c 100644
--- a/room/compiler/src/main/kotlin/androidx/room/solver/types/TypeConverter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/solver/types/TypeConverter.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.solver.types
 
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.CodeGenScope
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/verifier/DatabaseVerifier.kt b/room/compiler/src/main/kotlin/androidx/room/verifier/DatabaseVerifier.kt
index 8beb639..cdc63bc 100644
--- a/room/compiler/src/main/kotlin/androidx/room/verifier/DatabaseVerifier.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/verifier/DatabaseVerifier.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.verifier
 
-import androidx.room.processing.XElement
+import androidx.room.compiler.processing.XElement
 import androidx.room.processor.Context
 import androidx.room.vo.DatabaseView
 import androidx.room.vo.Entity
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/Constructor.kt b/room/compiler/src/main/kotlin/androidx/room/vo/Constructor.kt
index 016ac82..a8082ea 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/Constructor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/Constructor.kt
@@ -18,9 +18,9 @@
 
 import androidx.room.ext.L
 import androidx.room.ext.T
-import androidx.room.processing.XExecutableElement
-import androidx.room.processing.isConstructor
-import androidx.room.processing.isMethod
+import androidx.room.compiler.processing.XExecutableElement
+import androidx.room.compiler.processing.isConstructor
+import androidx.room.compiler.processing.isMethod
 import com.squareup.javapoet.CodeBlock
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/CustomTypeConverter.kt b/room/compiler/src/main/kotlin/androidx/room/vo/CustomTypeConverter.kt
index 012b6a0..96fac0f 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/CustomTypeConverter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/CustomTypeConverter.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
 import com.squareup.javapoet.TypeName
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/Dao.kt b/room/compiler/src/main/kotlin/androidx/room/vo/Dao.kt
index c65ef88..790b3af 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/Dao.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/Dao.kt
@@ -16,9 +16,9 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.isType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.isType
 import com.squareup.javapoet.ClassName
 import com.squareup.javapoet.TypeName
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/DaoMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/DaoMethod.kt
index 13dfbfd..15119f6 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/DaoMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/DaoMethod.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XMethodElement
 
 /**
  * References a method that returns a dao in a Database
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/Database.kt b/room/compiler/src/main/kotlin/androidx/room/vo/Database.kt
index 62faeac..e32179a 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/Database.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/Database.kt
@@ -19,8 +19,8 @@
 import androidx.room.RoomMasterTable
 import androidx.room.migration.bundle.DatabaseBundle
 import androidx.room.migration.bundle.SchemaBundle
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
 import com.squareup.javapoet.ClassName
 import org.apache.commons.codec.digest.DigestUtils
 import java.io.File
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/DatabaseView.kt b/room/compiler/src/main/kotlin/androidx/room/vo/DatabaseView.kt
index 46d77c5..76f079b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/DatabaseView.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/DatabaseView.kt
@@ -19,8 +19,8 @@
 import androidx.room.migration.bundle.BundleUtil
 import androidx.room.migration.bundle.DatabaseViewBundle
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XTypeElement
 
 class DatabaseView(
     element: XTypeElement,
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/DeletionMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/DeletionMethod.kt
index 61c9270..2217833 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/DeletionMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/DeletionMethod.kt
@@ -15,7 +15,7 @@
  */
 package androidx.room.vo
 
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.solver.shortcut.binder.DeleteOrUpdateMethodBinder
 
 class DeletionMethod(
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/Entity.kt b/room/compiler/src/main/kotlin/androidx/room/vo/Entity.kt
index c0e9756..5a90968 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/Entity.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/Entity.kt
@@ -18,8 +18,8 @@
 
 import androidx.room.migration.bundle.BundleUtil
 import androidx.room.migration.bundle.EntityBundle
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XTypeElement
 
 /**
  * A Pojo with a mapping SQLite table.
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/Field.kt b/room/compiler/src/main/kotlin/androidx/room/vo/Field.kt
index a71b42b..91625b8 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/Field.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/Field.kt
@@ -19,9 +19,9 @@
 import androidx.room.migration.bundle.FieldBundle
 import androidx.room.parser.Collate
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XElement
-import androidx.room.processing.XType
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.solver.types.CursorValueReader
 import androidx.room.solver.types.StatementValueBinder
 import com.squareup.javapoet.TypeName
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/FieldGetter.kt b/room/compiler/src/main/kotlin/androidx/room/vo/FieldGetter.kt
index 31e96f9..3257361 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/FieldGetter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/FieldGetter.kt
@@ -18,7 +18,7 @@
 
 import androidx.room.ext.L
 import androidx.room.ext.T
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import com.squareup.javapoet.CodeBlock
 
 data class FieldGetter(val name: String, val type: XType, val callType: CallType) {
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/FieldSetter.kt b/room/compiler/src/main/kotlin/androidx/room/vo/FieldSetter.kt
index ba1bd679..afe74d6 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/FieldSetter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/FieldSetter.kt
@@ -17,7 +17,7 @@
 package androidx.room.vo
 
 import androidx.room.ext.L
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import com.squareup.javapoet.CodeBlock
 
 data class FieldSetter(val name: String, val type: XType, val callType: CallType) {
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/FtsEntity.kt b/room/compiler/src/main/kotlin/androidx/room/vo/FtsEntity.kt
index e316f9d..e884247 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/FtsEntity.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/FtsEntity.kt
@@ -19,8 +19,8 @@
 import androidx.room.migration.bundle.BundleUtil
 import androidx.room.migration.bundle.FtsEntityBundle
 import androidx.room.parser.FtsVersion
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XTypeElement
 
 /**
  * An Entity with a mapping FTS table.
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/InsertionMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/InsertionMethod.kt
index 9b969f7..3eb1fd3 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/InsertionMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/InsertionMethod.kt
@@ -17,8 +17,8 @@
 package androidx.room.vo
 
 import androidx.room.OnConflictStrategy
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.shortcut.binder.InsertMethodBinder
 
 data class InsertionMethod(
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/KotlinDefaultMethodDelegate.kt b/room/compiler/src/main/kotlin/androidx/room/vo/KotlinDefaultMethodDelegate.kt
index 9b961ad..bcae03f 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/KotlinDefaultMethodDelegate.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/KotlinDefaultMethodDelegate.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XMethodElement
 
 /**
  * Represents a DAO method that delegates to a concrete implementation, such as a concrete function
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/LanguageId.kt b/room/compiler/src/main/kotlin/androidx/room/vo/LanguageId.kt
index 4a12c7d..8007dfa 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/LanguageId.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/LanguageId.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XElement
+import androidx.room.compiler.processing.XElement
 
 /**
  * Represents the 'languageid' column of an FTS entity.
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt b/room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt
index 43ebcd5..f72f1e4 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/Pojo.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.processor.DatabaseViewProcessor
 import androidx.room.processor.EntityProcessor
 import com.squareup.javapoet.TypeName
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/PojoMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/PojoMethod.kt
index fd678e4..1361d75 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/PojoMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/PojoMethod.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XMethodType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XMethodType
 
 /**
  * An executable element processed as member of a class (pojo or entity)
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/PrimaryKey.kt b/room/compiler/src/main/kotlin/androidx/room/vo/PrimaryKey.kt
index 671f5e8..fde1bf8 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/PrimaryKey.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/PrimaryKey.kt
@@ -16,7 +16,7 @@
 package androidx.room.vo
 
 import androidx.room.migration.bundle.PrimaryKeyBundle
-import androidx.room.processing.XElement
+import androidx.room.compiler.processing.XElement
 
 /**
  * Represents a PrimaryKey for an Entity.
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/QueryMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/QueryMethod.kt
index 2d9af9e..8d4f906 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/QueryMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/QueryMethod.kt
@@ -17,8 +17,8 @@
 package androidx.room.vo
 
 import androidx.room.parser.ParsedQuery
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.prepared.binder.PreparedQueryResultBinder
 import androidx.room.solver.query.result.QueryResultBinder
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/QueryParameter.kt b/room/compiler/src/main/kotlin/androidx/room/vo/QueryParameter.kt
index b3265ab..9411598 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/QueryParameter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/QueryParameter.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.query.parameter.QueryParameterAdapter
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/RawQueryMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/RawQueryMethod.kt
index fb4ad76..dc9635e 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/RawQueryMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/RawQueryMethod.kt
@@ -18,8 +18,8 @@
 
 import androidx.room.ext.CommonTypeNames
 import androidx.room.ext.SupportDbTypeNames
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.query.result.QueryResultBinder
 import com.squareup.javapoet.TypeName
 
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/Relation.kt b/room/compiler/src/main/kotlin/androidx/room/vo/Relation.kt
index 85d9ad1..8771777 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/Relation.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/Relation.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 
 /**
  * Value object created from processing a @Relation annotation.
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/RelationCollector.kt b/room/compiler/src/main/kotlin/androidx/room/vo/RelationCollector.kt
index f58ef3d..e90359c 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/RelationCollector.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/RelationCollector.kt
@@ -24,7 +24,7 @@
 import androidx.room.parser.ParsedQuery
 import androidx.room.parser.SQLTypeAffinity
 import androidx.room.parser.SqlParser
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors.cannotFindQueryResultAdapter
 import androidx.room.processor.ProcessorErrors.relationAffinityMismatch
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/ShortcutMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/ShortcutMethod.kt
index 7acd642..6467743 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/ShortcutMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/ShortcutMethod.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.solver.shortcut.binder.DeleteOrUpdateMethodBinder
 
 /**
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/ShortcutQueryParameter.kt b/room/compiler/src/main/kotlin/androidx/room/vo/ShortcutQueryParameter.kt
index 00d786c..daac19d 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/ShortcutQueryParameter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/ShortcutQueryParameter.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XType
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XVariableElement
 
 /**
  * Parameters used in DAO methods that are annotated with Insert, Delete, Update.
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/TransactionMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/TransactionMethod.kt
index 317fbe0..e70470b 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/TransactionMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/TransactionMethod.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XType
 import androidx.room.solver.transaction.binder.TransactionMethodBinder
 
 class TransactionMethod(
diff --git a/room/compiler/src/main/kotlin/androidx/room/vo/UpdateMethod.kt b/room/compiler/src/main/kotlin/androidx/room/vo/UpdateMethod.kt
index a4d921b..125abb1 100644
--- a/room/compiler/src/main/kotlin/androidx/room/vo/UpdateMethod.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/vo/UpdateMethod.kt
@@ -17,7 +17,7 @@
 package androidx.room.vo
 
 import androidx.room.OnConflictStrategy
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.solver.shortcut.binder.DeleteOrUpdateMethodBinder
 
 class UpdateMethod(
diff --git a/room/compiler/src/main/kotlin/androidx/room/writer/ClassWriter.kt b/room/compiler/src/main/kotlin/androidx/room/writer/ClassWriter.kt
index 8ba34d2..77976ff 100644
--- a/room/compiler/src/main/kotlin/androidx/room/writer/ClassWriter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/writer/ClassWriter.kt
@@ -19,7 +19,7 @@
 import androidx.room.RoomProcessor
 import androidx.room.ext.S
 import androidx.room.ext.typeName
-import androidx.room.processing.XProcessingEnv
+import androidx.room.compiler.processing.XProcessingEnv
 import androidx.room.solver.CodeGenScope.Companion.CLASS_PROPERTY_PREFIX
 import com.squareup.javapoet.AnnotationSpec
 import com.squareup.javapoet.ClassName
diff --git a/room/compiler/src/main/kotlin/androidx/room/writer/DaoWriter.kt b/room/compiler/src/main/kotlin/androidx/room/writer/DaoWriter.kt
index bfd8511..8f9be1c 100644
--- a/room/compiler/src/main/kotlin/androidx/room/writer/DaoWriter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/writer/DaoWriter.kt
@@ -21,12 +21,12 @@
 import androidx.room.ext.RoomTypeNames
 import androidx.room.ext.SupportDbTypeNames
 import androidx.room.ext.T
-import androidx.room.processing.MethodSpecHelper
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XElement
-import androidx.room.processing.XMethodElement
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.addOriginatingElement
+import androidx.room.compiler.processing.MethodSpecHelper
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XMethodElement
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.addOriginatingElement
 import androidx.room.processor.OnConflictProcessor
 import androidx.room.solver.CodeGenScope
 import androidx.room.solver.KotlinDefaultMethodDelegateBinder
diff --git a/room/compiler/src/main/kotlin/androidx/room/writer/DatabaseWriter.kt b/room/compiler/src/main/kotlin/androidx/room/writer/DatabaseWriter.kt
index 1baca0e..518575e 100644
--- a/room/compiler/src/main/kotlin/androidx/room/writer/DatabaseWriter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/writer/DatabaseWriter.kt
@@ -25,8 +25,8 @@
 import androidx.room.ext.SupportDbTypeNames
 import androidx.room.ext.T
 import androidx.room.ext.typeName
-import androidx.room.processing.MethodSpecHelper
-import androidx.room.processing.addOriginatingElement
+import androidx.room.compiler.processing.MethodSpecHelper
+import androidx.room.compiler.processing.addOriginatingElement
 import androidx.room.solver.CodeGenScope
 import androidx.room.vo.DaoMethod
 import androidx.room.vo.Database
diff --git a/room/compiler/src/test/kotlin/androidx/room/ext/ElementExtTest.kt b/room/compiler/src/test/kotlin/androidx/room/ext/ElementExtTest.kt
index 1beb56b..68fe011 100644
--- a/room/compiler/src/test/kotlin/androidx/room/ext/ElementExtTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/ext/ElementExtTest.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.ext
 
-import androidx.room.processing.XExecutableElement
+import androidx.room.compiler.processing.XExecutableElement
 import com.google.common.truth.Truth.assertThat
 import com.google.testing.compile.JavaFileObjects
 import com.squareup.javapoet.ClassName
diff --git a/room/compiler/src/test/kotlin/androidx/room/log/RLogTest.kt b/room/compiler/src/test/kotlin/androidx/room/log/RLogTest.kt
index 271df55..b87099d 100644
--- a/room/compiler/src/test/kotlin/androidx/room/log/RLogTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/log/RLogTest.kt
@@ -16,7 +16,7 @@
 
 package androidx.room.log
 
-import androidx.room.processing.XMessager
+import androidx.room.compiler.processing.XMessager
 import androidx.room.vo.Warning
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt
index e757ca2..2f5b095 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/DaoProcessorTest.kt
@@ -18,7 +18,7 @@
 
 import COMMON
 import androidx.room.ext.RoomTypeNames
-import androidx.room.processing.asDeclaredType
+import androidx.room.compiler.processing.asDeclaredType
 import androidx.room.testing.TestInvocation
 import androidx.room.testing.TestProcessor
 import androidx.room.vo.Dao
diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt
index d23b8c9..60efa6c 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/DatabaseProcessorTest.kt
@@ -21,8 +21,8 @@
 import androidx.room.parser.ParsedQuery
 import androidx.room.parser.QueryType
 import androidx.room.parser.Table
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.solver.query.result.EntityRowAdapter
 import androidx.room.solver.query.result.PojoRowAdapter
 import androidx.room.testing.TestInvocation
diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/DeletionMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/DeletionMethodProcessorTest.kt
index 027287d..b73e8a34 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/DeletionMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/DeletionMethodProcessorTest.kt
@@ -16,8 +16,8 @@
 package androidx.room.processor
 
 import androidx.room.Delete
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.processor.ProcessorErrors.CANNOT_FIND_DELETE_RESULT_ADAPTER
 import androidx.room.processor.ProcessorErrors.DELETION_MISSING_PARAMS
 import androidx.room.vo.DeletionMethod
diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt
index f2e3fed..25b6947 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/FieldProcessorTest.kt
@@ -19,7 +19,7 @@
 import androidx.room.Entity
 import androidx.room.parser.Collate
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.solver.types.ColumnTypeAdapter
 import androidx.room.testing.TestInvocation
 import androidx.room.testing.TestProcessor
diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/PojoProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/PojoProcessorTest.kt
index d2bdde9..088f7b8 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/PojoProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/PojoProcessorTest.kt
@@ -19,7 +19,7 @@
 import COMMON
 import androidx.room.Embedded
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.processor.ProcessorErrors.CANNOT_FIND_GETTER_FOR_FIELD
 import androidx.room.processor.ProcessorErrors.CANNOT_FIND_TYPE
 import androidx.room.processor.ProcessorErrors.POJO_FIELD_HAS_DUPLICATE_COLUMN_NAME
diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
index 4f421f4..6c2ca06 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/QueryMethodProcessorTest.kt
@@ -26,8 +26,8 @@
 import androidx.room.ext.typeName
 import androidx.room.parser.QueryType
 import androidx.room.parser.Table
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.ProcessorErrors.cannotFindQueryResultAdapter
 import androidx.room.solver.query.result.DataSourceFactoryQueryResultBinder
 import androidx.room.solver.query.result.ListQueryResultAdapter
diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt
index 8ee23dd..a4321c3 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/ShortcutMethodProcessorTest.kt
@@ -22,8 +22,8 @@
 import androidx.room.ext.GuavaUtilConcurrentTypeNames
 import androidx.room.ext.RxJava2TypeNames
 import androidx.room.ext.RxJava3TypeNames
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.testing.TestInvocation
 import androidx.room.testing.TestProcessor
 import androidx.room.vo.ShortcutMethod
diff --git a/room/compiler/src/test/kotlin/androidx/room/processor/UpdateMethodProcessorTest.kt b/room/compiler/src/test/kotlin/androidx/room/processor/UpdateMethodProcessorTest.kt
index ecc252d..5402b10 100644
--- a/room/compiler/src/test/kotlin/androidx/room/processor/UpdateMethodProcessorTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/processor/UpdateMethodProcessorTest.kt
@@ -17,8 +17,8 @@
 
 import androidx.room.OnConflictStrategy
 import androidx.room.Update
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XMethodElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XMethodElement
 import androidx.room.processor.ProcessorErrors.CANNOT_FIND_UPDATE_RESULT_ADAPTER
 import androidx.room.processor.ProcessorErrors.UPDATE_MISSING_PARAMS
 import androidx.room.vo.UpdateMethod
diff --git a/room/compiler/src/test/kotlin/androidx/room/solver/BasicColumnTypeAdaptersTest.kt b/room/compiler/src/test/kotlin/androidx/room/solver/BasicColumnTypeAdaptersTest.kt
index 1d6e7d6..43f7f21 100644
--- a/room/compiler/src/test/kotlin/androidx/room/solver/BasicColumnTypeAdaptersTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/solver/BasicColumnTypeAdaptersTest.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.solver
 
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.XType
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.XType
 import androidx.room.processor.Context
 import androidx.room.testing.TestInvocation
 import com.squareup.javapoet.ClassName
diff --git a/room/compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt b/room/compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
index 4c4a252..33039e5 100644
--- a/room/compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/solver/TypeAdapterStoreTest.kt
@@ -30,8 +30,8 @@
 import androidx.room.ext.RxJava3TypeNames
 import androidx.room.ext.T
 import androidx.room.parser.SQLTypeAffinity
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.asDeclaredType
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.asDeclaredType
 import androidx.room.processor.Context
 import androidx.room.processor.ProcessorErrors
 import androidx.room.solver.binderprovider.DataSourceFactoryQueryResultBinderProvider
diff --git a/room/compiler/src/test/kotlin/androidx/room/solver/TypeAssignmentTest.kt b/room/compiler/src/test/kotlin/androidx/room/solver/TypeAssignmentTest.kt
index b7e94e3..75f3edd 100644
--- a/room/compiler/src/test/kotlin/androidx/room/solver/TypeAssignmentTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/solver/TypeAssignmentTest.kt
@@ -16,8 +16,8 @@
 
 package androidx.room.solver
 
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.testing.TestInvocation
 import com.google.testing.compile.JavaFileObjects
 import org.hamcrest.CoreMatchers.`is`
diff --git a/room/compiler/src/test/kotlin/androidx/room/testing/TestInvocation.kt b/room/compiler/src/test/kotlin/androidx/room/testing/TestInvocation.kt
index e32b344..b91bd22 100644
--- a/room/compiler/src/test/kotlin/androidx/room/testing/TestInvocation.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/testing/TestInvocation.kt
@@ -16,9 +16,9 @@
 
 package androidx.room.testing
 
-import androidx.room.processing.XProcessingEnv
-import androidx.room.processing.XRoundEnv
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XProcessingEnv
+import androidx.room.compiler.processing.XRoundEnv
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.processor.Context
 import javax.annotation.processing.RoundEnvironment
 
diff --git a/room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt b/room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt
index 6496fec..d9a3cea 100644
--- a/room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/testing/TestProcessor.kt
@@ -16,9 +16,9 @@
 
 package androidx.room.testing
 
-import androidx.room.processing.JavacTestProcessor
-import androidx.room.processing.XRoundEnv
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.JavacTestProcessor
+import androidx.room.compiler.processing.XRoundEnv
+import androidx.room.compiler.processing.XTypeElement
 import androidx.room.processor.Context
 import javax.lang.model.SourceVersion
 import kotlin.reflect.KClass
diff --git a/room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt b/room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt
index f7cab4d..218215b 100644
--- a/room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/testing/test_util.kt
@@ -26,9 +26,9 @@
 import androidx.room.ext.RoomRxJava3TypeNames
 import androidx.room.ext.RxJava2TypeNames
 import androidx.room.ext.RxJava3TypeNames
-import androidx.room.processing.XElement
-import androidx.room.processing.XType
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.processor.DatabaseViewProcessor
 import androidx.room.processor.TableEntityProcessor
 import androidx.room.solver.CodeGenScope
diff --git a/room/compiler/src/test/kotlin/androidx/room/verifier/DatabaseVerifierTest.kt b/room/compiler/src/test/kotlin/androidx/room/verifier/DatabaseVerifierTest.kt
index bbe2969..e8eae61 100644
--- a/room/compiler/src/test/kotlin/androidx/room/verifier/DatabaseVerifierTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/verifier/DatabaseVerifierTest.kt
@@ -19,12 +19,12 @@
 import androidx.room.parser.Collate
 import androidx.room.parser.SQLTypeAffinity
 import androidx.room.parser.SqlParser
-import androidx.room.processing.XConstructorElement
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XElement
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
-import androidx.room.processing.XVariableElement
+import androidx.room.compiler.processing.XConstructorElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
+import androidx.room.compiler.processing.XVariableElement
 import androidx.room.processor.Context
 import androidx.room.testing.TestInvocation
 import androidx.room.vo.CallType
diff --git a/room/compiler/src/test/kotlin/androidx/room/vo/DatabaseTest.kt b/room/compiler/src/test/kotlin/androidx/room/vo/DatabaseTest.kt
index b9f67e0..34b0b0a 100644
--- a/room/compiler/src/test/kotlin/androidx/room/vo/DatabaseTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/vo/DatabaseTest.kt
@@ -16,11 +16,11 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XConstructorElement
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XElement
-import androidx.room.processing.XType
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XConstructorElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XType
+import androidx.room.compiler.processing.XTypeElement
 import org.apache.commons.codec.digest.DigestUtils
 import org.junit.Assert.assertEquals
 import org.junit.Test
diff --git a/room/compiler/src/test/kotlin/androidx/room/vo/EntityTest.kt b/room/compiler/src/test/kotlin/androidx/room/vo/EntityTest.kt
index 5d81dc1..15756e7 100644
--- a/room/compiler/src/test/kotlin/androidx/room/vo/EntityTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/vo/EntityTest.kt
@@ -16,10 +16,10 @@
 
 package androidx.room.vo
 
-import androidx.room.processing.XConstructorElement
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XElement
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XConstructorElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XTypeElement
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/room/compiler/src/test/kotlin/androidx/room/vo/FtsEntityTest.kt b/room/compiler/src/test/kotlin/androidx/room/vo/FtsEntityTest.kt
index acc4574..6efc50e 100644
--- a/room/compiler/src/test/kotlin/androidx/room/vo/FtsEntityTest.kt
+++ b/room/compiler/src/test/kotlin/androidx/room/vo/FtsEntityTest.kt
@@ -17,9 +17,9 @@
 package androidx.room.vo
 
 import androidx.room.parser.FtsVersion
-import androidx.room.processing.XDeclaredType
-import androidx.room.processing.XElement
-import androidx.room.processing.XTypeElement
+import androidx.room.compiler.processing.XDeclaredType
+import androidx.room.compiler.processing.XElement
+import androidx.room.compiler.processing.XTypeElement
 import mockElementAndType
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
diff --git a/room/integration-tests/incremental-annotation-processing/build.gradle b/room/integration-tests/incremental-annotation-processing/build.gradle
index acc978a..770558d 100644
--- a/room/integration-tests/incremental-annotation-processing/build.gradle
+++ b/room/integration-tests/incremental-annotation-processing/build.gradle
@@ -39,4 +39,5 @@
         tasks.findByPath(":room:room-runtime:publish"),
         tasks.findByPath(":room:room-migration:publish"),
         tasks.findByPath(":room:room-compiler:publish"),
+        tasks.findByPath(":room:room-compiler-processing:publish"),
 )
diff --git a/settings.gradle b/settings.gradle
index 689b512..7f3221a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -286,7 +286,7 @@
 includeProject(":room:room-benchmark", "room/benchmark")
 includeProject(":room:room-common", "room/common")
 includeProject(":room:room-compiler", "room/compiler")
-includeProject(":room:room-compiler-xprocessing", "room/compiler-xprocessing")
+includeProject(":room:room-compiler-processing", "room/compiler-processing")
 includeProject(":room:room-guava", "room/guava")
 includeProject(":room:room-ktx", "room/ktx")
 includeProject(":room:room-migration", "room/migration")