diff --git a/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/util/CypherOrderability.java b/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderability.java
similarity index 99%
rename from community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/util/CypherOrderability.java
rename to community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderability.java
index 16a1a0a4155c9..de69036ef2a84 100644
--- a/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/util/CypherOrderability.java
+++ b/community/cypher/cypher-compiler-3.2/src/main/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderability.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_2.util;
+package org.neo4j.cypher.internal.compiler.v3_2.common;
 
 import java.util.Arrays;
 import java.util.Comparator;
diff --git a/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/Comparer.scala b/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/Comparer.scala
index 4126b00bcb914..5e0e84bc58ccd 100644
--- a/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/Comparer.scala
+++ b/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/Comparer.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_2
 
 import org.neo4j.cypher.internal.compiler.v3_2.pipes.QueryState
 import org.neo4j.cypher.internal.compiler.v3_2.spi.{NodeIdWrapper, RelationshipIdWrapper}
-import org.neo4j.cypher.internal.compiler.v3_2.util.CypherOrderability
+import org.neo4j.cypher.internal.compiler.v3_2.common.CypherOrderability
 import org.neo4j.graphdb.{Node, Relationship}
 
 import scala.collection.JavaConverters._
diff --git a/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/ExplainExecutionResult.scala b/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/ExplainExecutionResult.scala
index 1418efb882564..75dcd8bb986ba 100644
--- a/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/ExplainExecutionResult.scala
+++ b/community/cypher/cypher-compiler-3.2/src/main/scala/org/neo4j/cypher/internal/compiler/v3_2/ExplainExecutionResult.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.internal.compiler.v3_2
 
 import java.io.PrintWriter
-import java.{util => javaUtil}
+import java.util
 import java.util.Collections
 
 import org.neo4j.cypher.internal.compiler.v3_2.executionplan.{InternalExecutionResult, InternalQueryType}
@@ -35,9 +35,9 @@ case class ExplainExecutionResult(columns: List[String],
                                   notifications: Set[InternalNotification])
   extends InternalExecutionResult {
 
-  def javaIterator: ResourceIterator[javaUtil.Map[String, Any]] = new EmptyResourceIterator()
+  def javaIterator: ResourceIterator[util.Map[String, Any]] = new EmptyResourceIterator()
   def columnAs[T](column: String) = Iterator.empty
-  def javaColumns: javaUtil.List[String] = Collections.emptyList()
+  def javaColumns: util.List[String] = Collections.emptyList()
 
   def queryStatistics() = InternalQueryStatistics()
 
diff --git a/community/cypher/cypher-compiler-3.2/src/test/java/org/neo4j/cypher/internal/compiler/v3_2/util/CypherOrderabilityTest.java b/community/cypher/cypher-compiler-3.2/src/test/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderabilityTest.java
similarity index 99%
rename from community/cypher/cypher-compiler-3.2/src/test/java/org/neo4j/cypher/internal/compiler/v3_2/util/CypherOrderabilityTest.java
rename to community/cypher/cypher-compiler-3.2/src/test/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderabilityTest.java
index 2c6b7971f4e7b..6ac5c01ac9741 100644
--- a/community/cypher/cypher-compiler-3.2/src/test/java/org/neo4j/cypher/internal/compiler/v3_2/util/CypherOrderabilityTest.java
+++ b/community/cypher/cypher-compiler-3.2/src/test/java/org/neo4j/cypher/internal/compiler/v3_2/common/CypherOrderabilityTest.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compiler.v3_2.util;
+package org.neo4j.cypher.internal.compiler.v3_2.common;
 
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/codegen/AuxGenerator.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/codegen/AuxGenerator.scala
index 1288252fb5d60..dd953b323ebf7 100644
--- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/codegen/AuxGenerator.scala
+++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/codegen/AuxGenerator.scala
@@ -26,7 +26,7 @@ import org.neo4j.cypher.internal.codegen.CompiledEquivalenceUtils
 import org.neo4j.cypher.internal.compiled_runtime.v3_2.codegen.CodeGenContext
 import org.neo4j.cypher.internal.compiled_runtime.v3_2.codegen.ir.expressions.{CodeGenType, ReferenceType, RepresentationType}
 import org.neo4j.cypher.internal.compiled_runtime.v3_2.codegen.spi._
-import org.neo4j.cypher.internal.compiler.v3_2.util.CypherOrderability
+import org.neo4j.cypher.internal.compiler.v3_2.common.CypherOrderability
 import org.neo4j.cypher.internal.frontend.v3_2.helpers._
 import org.neo4j.cypher.internal.frontend.v3_2.symbols