diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 940667d0d9..30df60b862 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -19543,6 +19543,42 @@ public class DSL {
         return new Xmlforest(fields);
     }
 
+    /**
+     * The <code>XMLPI</code> function.
+     */
+    @NotNull
+    @Support({ POSTGRES })
+    public static Field<XML> xmlpi(@Stringly.Name String target, Field<?> content) {
+        return new Xmlpi(DSL.name(target), content);
+    }
+
+    /**
+     * The <code>XMLPI</code> function.
+     */
+    @NotNull
+    @Support({ POSTGRES })
+    public static Field<XML> xmlpi(Name target, Field<?> content) {
+        return new Xmlpi(target, content);
+    }
+
+    /**
+     * The <code>XMLPI</code> function.
+     */
+    @NotNull
+    @Support({ POSTGRES })
+    public static Field<XML> xmlpi(@Stringly.Name String target) {
+        return new Xmlpi(DSL.name(target));
+    }
+
+    /**
+     * The <code>XMLPI</code> function.
+     */
+    @NotNull
+    @Support({ POSTGRES })
+    public static Field<XML> xmlpi(Name target) {
+        return new Xmlpi(target);
+    }
+
     /**
      * The <code>XMLSERIALIZE_DOCUMENT</code> function.
      *
@@ -22964,42 +23000,6 @@ public class DSL {
         return new XMLAttributesImpl(attributes);
     }
 
-    /**
-     * The XML processing instruction constructor.
-     */
-    @NotNull
-    @Support({ POSTGRES })
-    public static Field<XML> xmlpi(String target) {
-        return xmlpi(name(target), null);
-    }
-
-    /**
-     * The XML processing instruction constructor.
-     */
-    @NotNull
-    @Support({ POSTGRES })
-    public static Field<XML> xmlpi(Name target) {
-        return xmlpi(target, null);
-    }
-
-    /**
-     * The XML processing instruction constructor.
-     */
-    @NotNull
-    @Support({ POSTGRES })
-    public static Field<XML> xmlpi(String target, Field<?> content) {
-        return xmlpi(name(target), content);
-    }
-
-    /**
-     * The XML processing instruction constructor.
-     */
-    @NotNull
-    @Support({ POSTGRES })
-    public static Field<XML> xmlpi(Name target, Field<?> content) {
-        return new XMLPI(target, content);
-    }
-
     /**
      * The XML aggregate function.
      */
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLPI.java b/jOOQ/src/main/java/org/jooq/impl/XMLPI.java
deleted file mode 100644
index 0ef6917a1a..0000000000
--- a/jOOQ/src/main/java/org/jooq/impl/XMLPI.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Other licenses:
- * -----------------------------------------------------------------------------
- * Commercial licenses for this work are available. These replace the above
- * ASL 2.0 and offer limited warranties, support, maintenance, and commercial
- * database integrations.
- *
- * For more information, please visit: http://www.jooq.org/licenses
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
-package org.jooq.impl;
-
-import static org.jooq.impl.Keywords.K_NAME;
-import static org.jooq.impl.Names.N_XMLPI;
-
-import org.jooq.Context;
-import org.jooq.Field;
-import org.jooq.Name;
-import org.jooq.XML;
-
-/**
- * @author Lukas Eder
- */
-final class XMLPI extends AbstractField<XML> {
-
-    private final Name        target;
-    private final Field<?>    content;
-
-    XMLPI(Name target, Field<?> content) {
-        super(N_XMLPI, SQLDataType.XML);
-
-        this.target = target;
-        this.content = content;
-    }
-
-    @Override
-    public final void accept(Context<?> ctx) {
-        ctx.visit(N_XMLPI).sql('(').visit(K_NAME).sql(' ').visit(target);
-
-        if (content != null)
-            ctx.sql(", ").visit(content);
-
-        ctx.sql(')');
-    }
-}