diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexIncludeStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexIncludeStep.java
index 083d0b10b5..11908f4236 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexIncludeStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexIncludeStep.java
@@ -78,7 +78,7 @@ public interface CreateIndexIncludeStep extends CreateIndexWhereStep {
      */
     @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
     @NotNull @CheckReturnValue
-    CreateIndexWhereStep include(String... include);
+    CreateIndexWhereStep include(@Stringly.Name String... include);
 
     /**
      * Add the <code>INCLUDE</code> clause to the <code>CREATE INDEX</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexStep.java
index 40ce08669e..ee0c099444 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexStep.java
@@ -75,7 +75,7 @@ public interface CreateIndexStep {
      */
     @Support({ CUBRID, DERBY, DUCKDB, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
     @NotNull @CheckReturnValue
-    CreateIndexIncludeStep on(@Stringly.Name String table, String... on);
+    CreateIndexIncludeStep on(@Stringly.Name String table, @Stringly.Name String... on);
 
     /**
      * Add the <code>ON</code> clause to the <code>CREATE INDEX</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableElementListStep.java b/jOOQ/src/main/java/org/jooq/CreateTableElementListStep.java
index f9d34909a0..5ff8a6f2ef 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableElementListStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableElementListStep.java
@@ -89,7 +89,7 @@ public interface CreateTableElementListStep extends CreateTableAsStep {
      */
     @Support
     @NotNull @CheckReturnValue
-    CreateTableElementListStep columns(String... columns);
+    CreateTableElementListStep columns(@Stringly.Name String... columns);
 
     /**
      * Add the <code>COLUMNS</code> clause to the <code>CREATE TABLE</code> statement.
@@ -166,7 +166,7 @@ public interface CreateTableElementListStep extends CreateTableAsStep {
      */
     @Support
     @NotNull @CheckReturnValue
-    CreateTableElementListStep primaryKey(String... fields);
+    CreateTableElementListStep primaryKey(@Stringly.Name String... fields);
 
     /**
      * Add the <code>PRIMARY KEY</code> clause to the <code>CREATE TABLE</code> statement.
@@ -194,7 +194,7 @@ public interface CreateTableElementListStep extends CreateTableAsStep {
      */
     @Support
     @NotNull @CheckReturnValue
-    CreateTableElementListStep unique(String... fields);
+    CreateTableElementListStep unique(@Stringly.Name String... fields);
 
     /**
      * Add the <code>UNIQUE</code> clause to the <code>CREATE TABLE</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/CreateTypeStep.java b/jOOQ/src/main/java/org/jooq/CreateTypeStep.java
index 3230046518..99510f292f 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTypeStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTypeStep.java
@@ -75,7 +75,7 @@ public interface CreateTypeStep {
      */
     @Support({ H2, POSTGRES, YUGABYTEDB })
     @NotNull @CheckReturnValue
-    CreateTypeFinalStep asEnum(String... values);
+    CreateTypeFinalStep asEnum(@Stringly.Param String... values);
 
     /**
      * Add the <code>AS ENUM</code> clause to the <code>CREATE TYPE</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 319cc2b6db..26dea399d7 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -10953,7 +10953,7 @@ public interface DSLContext extends Scope {
      */
     @NotNull @CheckReturnValue
     @Support({ H2, POSTGRES, YUGABYTEDB })
-    DropTypeStep dropType(String... types);
+    DropTypeStep dropType(@Stringly.Name String... types);
 
     /**
      * The <code>DROP TYPE</code> statement.
@@ -11016,7 +11016,7 @@ public interface DSLContext extends Scope {
      */
     @NotNull @CheckReturnValue
     @Support({ H2, POSTGRES, YUGABYTEDB })
-    DropTypeStep dropTypeIfExists(String... types);
+    DropTypeStep dropTypeIfExists(@Stringly.Name String... types);
 
     /**
      * The <code>DROP TYPE IF EXISTS</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index a957324530..b748d08371 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -9884,7 +9884,7 @@ public class DSL {
      */
     @NotNull @CheckReturnValue
     @Support({ H2, POSTGRES, YUGABYTEDB })
-    public static org.jooq.DropTypeStep dropType(String... types) {
+    public static org.jooq.DropTypeStep dropType(@Stringly.Name String... types) {
         return dsl().dropType(types);
     }
 
@@ -9989,7 +9989,7 @@ public class DSL {
      */
     @NotNull @CheckReturnValue
     @Support({ H2, POSTGRES, YUGABYTEDB })
-    public static org.jooq.DropTypeStep dropTypeIfExists(String... types) {
+    public static org.jooq.DropTypeStep dropTypeIfExists(@Stringly.Name String... types) {
         return dsl().dropTypeIfExists(types);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index fead41128d..af41d1dd6e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -3803,7 +3803,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
     }
 
     @Override
-    public org.jooq.DropTypeStep dropType(String... types) {
+    public org.jooq.DropTypeStep dropType(@Stringly.Name String... types) {
         return new DropTypeImpl(configuration(), Tools.map(types, e -> DSL.type(e)), false);
     }
 
@@ -3838,7 +3838,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
     }
 
     @Override
-    public org.jooq.DropTypeStep dropTypeIfExists(String... types) {
+    public org.jooq.DropTypeStep dropTypeIfExists(@Stringly.Name String... types) {
         return new DropTypeImpl(configuration(), Tools.map(types, e -> DSL.type(e)), true);
     }