diff --git a/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java
index cf661341..e192f9d0 100644
--- a/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java
+++ b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java
@@ -22,7 +22,7 @@
 class ControllerWriter extends BaseControllerWriter {
 
   private static final String AT_GENERATED = "@Generated(\"avaje-helidon-generator\")";
-  private static final String IMPORT_HTTP_STATUS = "import static io.helidon.http.Http.Status.*;";
+  private static final String IMPORT_HTTP_STATUS = "import static io.helidon.http.Status.*;";
 
   private final boolean useJsonB;
   private final Map<String, UType> jsonTypes;
@@ -48,9 +48,9 @@ class ControllerWriter extends BaseControllerWriter {
     reader.addImportType("io.helidon.webserver.http.ServerRequest");
     reader.addImportType("io.helidon.webserver.http.ServerResponse");
     reader.addImportType("io.helidon.webserver.http.HttpFeature");
-    reader.addImportType("io.helidon.http.Http.HeaderNames");
+    reader.addImportType("io.helidon.http.HeaderNames");
     if (reader.isIncludeValidator()) {
-      reader.addImportType("io.helidon.http.Http");
+      reader.addImportType("io.helidon.http.HeaderName");
     }
     if (reader.methods().stream()
         .map(MethodReader::webMethod)
@@ -118,7 +118,7 @@ private void writeClassStart() {
     }
 
     if (reader.isIncludeValidator()) {
-      writer.append("  private static final Http.HeaderName HEADER_ACCEPT_LANGUAGE = HeaderNames.create(\"Accept-Language\");").eol();
+      writer.append("  private static final HeaderName HEADER_ACCEPT_LANGUAGE = HeaderNames.create(\"Accept-Language\");").eol();
     }
 
     writer.append("  private final %s %s;", controllerType, controllerName).eol();
diff --git a/tests/pom.xml b/tests/pom.xml
index fd51a3e2..e539a691 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -17,7 +17,7 @@
     <jackson.version>2.14.1</jackson.version>
     <jex.version>2.5</jex.version>
     <avaje-inject.version>9.5</avaje-inject.version>
-    <nima.version>4.0.0-M2</nima.version>
+    <nima.version>4.0.0-RC1</nima.version>
   </properties>
 
   <modules>