diff --git a/bom/pom.xml b/bom/pom.xml
index dc98f41312312..2c794f3141160 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -77,7 +77,7 @@
         <!-- What we actually depend on for the annotations, as latest Graal
            is not available in Maven fast enough: -->
         <graal-sdk.version>1.0.0-rc12</graal-sdk.version>
-        <gizmo.version>1.0.0.Alpha1</gizmo.version>
+        <gizmo.version>1.0.0.Alpha2</gizmo.version>
         <jackson.version>2.9.8</jackson.version>
         <commons-beanutils-core.version>1.8.3</commons-beanutils-core.version>
         <commons-logging.version>1.2</commons-logging.version>
@@ -507,12 +507,12 @@
             </dependency>
 
             <dependency>
-                <groupId>org.jboss.gizmo</groupId>
+                <groupId>io.quarkus.gizmo</groupId>
                 <artifactId>gizmo</artifactId>
                 <version>${gizmo.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.jboss.gizmo</groupId>
+                <groupId>io.quarkus.gizmo</groupId>
                 <artifactId>gizmo</artifactId>
                 <type>test-jar</type>
                 <scope>test</scope>
diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
index 74649f54492fc..5b8baaf85d863 100644
--- a/core/deployment/pom.xml
+++ b/core/deployment/pom.xml
@@ -54,7 +54,7 @@
             <artifactId>jboss-classfilewriter</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.gizmo</groupId>
+            <groupId>io.quarkus.gizmo</groupId>
             <artifactId>gizmo</artifactId>
         </dependency>
         <dependency>
@@ -70,7 +70,7 @@
             <artifactId>quarkus-core-runtime</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.gizmo</groupId>
+            <groupId>io.quarkus.gizmo</groupId>
             <artifactId>gizmo</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/AccessorFinder.java b/core/deployment/src/main/java/io/quarkus/deployment/AccessorFinder.java
index c5560d0879fb1..b8abfa7e5862a 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/AccessorFinder.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/AccessorFinder.java
@@ -1,13 +1,13 @@
 package io.quarkus.deployment;
 
-import static org.jboss.protean.gizmo.DescriptorUtils.isPrimitive;
+import static io.quarkus.gizmo.DescriptorUtils.isPrimitive;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jboss.protean.gizmo.DescriptorUtils;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.DescriptorUtils;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodDescriptor;
 
 /**
  */
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ClassOutput.java b/core/deployment/src/main/java/io/quarkus/deployment/ClassOutput.java
index f584a113189d3..1902500d7fdd1 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/ClassOutput.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/ClassOutput.java
@@ -35,8 +35,8 @@ public interface ClassOutput {
     void writeResource(String name, byte[] data) throws IOException;
 
     //TODO: we should not need both these classes
-    static org.jboss.protean.gizmo.ClassOutput gizmoAdaptor(ClassOutput out, boolean applicationClass) {
-        return new org.jboss.protean.gizmo.ClassOutput() {
+    static io.quarkus.gizmo.ClassOutput gizmoAdaptor(ClassOutput out, boolean applicationClass) {
+        return new io.quarkus.gizmo.ClassOutput() {
             @Override
             public void write(String name, byte[] data) {
                 try {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BooleanConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BooleanConfigType.java
index 61bcee03d8112..170b2f578b03c 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BooleanConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BooleanConfigType.java
@@ -3,11 +3,10 @@
 import java.lang.reflect.Field;
 import java.util.Optional;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/CompoundConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/CompoundConfigType.java
index 8b3e709f989da..6b75c6e6d5815 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/CompoundConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/CompoundConfigType.java
@@ -1,8 +1,7 @@
 package io.quarkus.deployment.configuration;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ResultHandle;
-
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigDefinition.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigDefinition.java
index 9ccfcea332682..67d7b70d75555 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigDefinition.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigDefinition.java
@@ -29,17 +29,17 @@
 import java.util.OptionalLong;
 import java.util.TreeMap;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.objectweb.asm.Opcodes;
 import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigType.java
index 09fa2029d7bdf..a4734d4bf8f5b 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigType.java
@@ -5,11 +5,10 @@
 import java.util.Optional;
 import java.util.function.IntFunction;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/DoubleConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/DoubleConfigType.java
index 7999afaaf709b..bf65c8110b49c 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/DoubleConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/DoubleConfigType.java
@@ -3,12 +3,12 @@
 import java.lang.reflect.Field;
 import java.util.OptionalDouble;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/FloatConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/FloatConfigType.java
index 01e5c152904f6..efd7815ffa3d6 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/FloatConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/FloatConfigType.java
@@ -2,14 +2,14 @@
 
 import java.lang.reflect.Field;
 
-import org.jboss.protean.gizmo.AssignableResultHandle;
-import org.jboss.protean.gizmo.BranchResult;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/GroupConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/GroupConfigType.java
index abfbdca588dba..608a1ec17a545 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/GroupConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/GroupConfigType.java
@@ -8,14 +8,14 @@
 import java.util.Map;
 import java.util.TreeSet;
 
-import org.jboss.protean.gizmo.AssignableResultHandle;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/IntConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/IntConfigType.java
index ea8f96d21b9b0..15e9358037049 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/IntConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/IntConfigType.java
@@ -3,12 +3,12 @@
 import java.lang.reflect.Field;
 import java.util.OptionalInt;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/LeafConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/LeafConfigType.java
index b9355515812c6..b2f14863555bc 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/LeafConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/LeafConfigType.java
@@ -2,11 +2,11 @@
 
 import java.lang.reflect.Field;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.wildfly.common.annotation.NotNull;
 
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/LongConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/LongConfigType.java
index fcf185b6d5fd9..6714ab8a7f255 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/LongConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/LongConfigType.java
@@ -3,12 +3,12 @@
 import java.lang.reflect.Field;
 import java.util.OptionalLong;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/MapConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/MapConfigType.java
index c6155eb777b57..6c80961aa0ad3 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/MapConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/MapConfigType.java
@@ -4,13 +4,13 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.jboss.protean.gizmo.AssignableResultHandle;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ObjectConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ObjectConfigType.java
index 4b11bdde1e07e..1fc7af943045c 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ObjectConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ObjectConfigType.java
@@ -2,11 +2,10 @@
 
 import java.lang.reflect.Field;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ObjectListConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ObjectListConfigType.java
index 14cfe410f1363..a5c0e93f279fb 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ObjectListConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ObjectListConfigType.java
@@ -6,11 +6,10 @@
 import java.util.List;
 import java.util.function.IntFunction;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.ArrayListFactory;
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.quarkus.runtime.configuration.NameIterator;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/OptionalObjectConfigType.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/OptionalObjectConfigType.java
index 445cec6dd798b..9f7c71db0edf7 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/OptionalObjectConfigType.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/OptionalObjectConfigType.java
@@ -3,11 +3,10 @@
 import java.lang.reflect.Field;
 import java.util.Optional;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-
 import io.quarkus.deployment.AccessorFinder;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.SmallRyeConfig;
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyBuildStep.java
index 451625ff4fbe5..7a2ed6eb8aff3 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyBuildStep.java
@@ -1,12 +1,11 @@
 package io.quarkus.deployment.recording;
 
-import org.jboss.protean.gizmo.ClassOutput;
-
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.AnnotationProxyBuildItem;
 import io.quarkus.deployment.builditem.ApplicationIndexBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.gizmo.ClassOutput;
 
 public class AnnotationProxyBuildStep {
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java
index 42435cb7bcad4..71306296480ab 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/AnnotationProxyProvider.java
@@ -25,13 +25,13 @@
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Indexer;
 import org.jboss.jandex.MethodInfo;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
 
 import io.quarkus.deployment.util.IoUtil;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
 
 public class AnnotationProxyProvider {
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java
index 0cbe981910336..e77da09113ef9 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/BytecodeRecorderImpl.java
@@ -16,8 +16,8 @@
 
 package io.quarkus.deployment.recording;
 
-import static org.jboss.protean.gizmo.MethodDescriptor.ofConstructor;
-import static org.jboss.protean.gizmo.MethodDescriptor.ofMethod;
+import static io.quarkus.gizmo.MethodDescriptor.ofConstructor;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Array;
@@ -51,19 +51,19 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
-import org.jboss.protean.gizmo.AssignableResultHandle;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.CatchBlockCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-import org.jboss.protean.gizmo.TryBlock;
 import org.wildfly.common.Assert;
 
 import io.quarkus.deployment.ClassOutput;
 import io.quarkus.deployment.recording.AnnotationProxyProvider.AnnotationProxy;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.CatchBlockCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.runtime.ObjectSubstitution;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.StartupContext;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/recording/ObjectLoader.java b/core/deployment/src/main/java/io/quarkus/deployment/recording/ObjectLoader.java
index 648a0c6f2299e..ff5405d9179bb 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/recording/ObjectLoader.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/recording/ObjectLoader.java
@@ -1,7 +1,7 @@
 package io.quarkus.deployment.recording;
 
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  * A segment of code generation which produces the necessary instructions to load the given object. The result handle
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigurationSetup.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigurationSetup.java
index 163ffeddca45c..bfbdb706e56eb 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigurationSetup.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigurationSetup.java
@@ -28,14 +28,6 @@
 import org.eclipse.microprofile.config.spi.Converter;
 import org.graalvm.nativeimage.ImageInfo;
 import org.jboss.logging.Logger;
-import org.jboss.protean.gizmo.BranchResult;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.objectweb.asm.Opcodes;
 import org.wildfly.common.net.CidrAddress;
 import org.wildfly.security.ssl.CipherSuiteSelector;
@@ -58,6 +50,14 @@
 import io.quarkus.deployment.configuration.LeafConfigType;
 import io.quarkus.deployment.recording.ObjectLoader;
 import io.quarkus.deployment.util.ServiceUtil;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.configuration.ApplicationPropertiesConfigSource;
 import io.quarkus.runtime.configuration.CidrAddressConverter;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
index 55429138d6e74..59be7ea0fccdc 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/MainClassBuildStep.java
@@ -16,8 +16,8 @@
 
 package io.quarkus.deployment.steps;
 
-import static org.jboss.protean.gizmo.MethodDescriptor.ofConstructor;
-import static org.jboss.protean.gizmo.MethodDescriptor.ofMethod;
+import static io.quarkus.gizmo.MethodDescriptor.ofConstructor;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
 
 import java.lang.reflect.Modifier;
 import java.util.List;
@@ -27,14 +27,6 @@
 
 import org.graalvm.nativeimage.ImageInfo;
 import org.jboss.builder.Version;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.CatchBlockCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.FieldCreator;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-import org.jboss.protean.gizmo.TryBlock;
 
 import io.quarkus.deployment.ClassOutput;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -51,6 +43,14 @@
 import io.quarkus.deployment.builditem.StaticBytecodeRecorderBuildItem;
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.recording.BytecodeRecorderImpl;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.CatchBlockCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.runtime.Application;
 import io.quarkus.runtime.StartupContext;
 import io.quarkus.runtime.StartupTask;
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/SubstrateAutoFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/SubstrateAutoFeatureStep.java
index 35ec53a0fae33..5184be82797b5 100644
--- a/core/deployment/src/main/java/io/quarkus/deployment/steps/SubstrateAutoFeatureStep.java
+++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/SubstrateAutoFeatureStep.java
@@ -16,7 +16,7 @@
 
 package io.quarkus.deployment.steps;
 
-import static org.jboss.protean.gizmo.MethodDescriptor.ofMethod;
+import static io.quarkus.gizmo.MethodDescriptor.ofMethod;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
@@ -31,17 +31,16 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jboss.protean.gizmo.CatchBlockCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-import org.jboss.protean.gizmo.TryBlock;
-
 import io.quarkus.deployment.ClassOutput;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ClassOutputBuildItem;
 import io.quarkus.deployment.builditem.substrate.*;
+import io.quarkus.gizmo.CatchBlockCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 import io.quarkus.runtime.ResourceHelper;
 
 public class SubstrateAutoFeatureStep {
diff --git a/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java b/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java
index 21dbb4487c781..d668ef877f640 100644
--- a/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java
+++ b/core/deployment/src/test/java/io/quarkus/deployment/recording/BytecodeRecorderTestCase.java
@@ -24,11 +24,11 @@
 import java.util.HashSet;
 import java.util.function.Consumer;
 
-import org.jboss.protean.gizmo.TestClassLoader;
 import org.junit.Assert;
 import org.junit.Test;
 
 import io.quarkus.deployment.ClassOutput;
+import io.quarkus.gizmo.TestClassLoader;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.StartupContext;
 import io.quarkus.runtime.StartupTask;
diff --git a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java
index 53e167ac877ac..e25ce61633194 100644
--- a/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java
+++ b/extensions/agroal/deployment/src/main/java/io/quarkus/agroal/deployment/AgroalProcessor.java
@@ -34,11 +34,6 @@
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 
 import io.agroal.api.AgroalDataSource;
 import io.quarkus.agroal.DataSource;
@@ -62,6 +57,11 @@
 import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
 import io.quarkus.deployment.recording.RecorderContext;
 import io.quarkus.deployment.util.HashUtil;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 class AgroalProcessor {
 
diff --git a/extensions/hibernate-orm/deployment/pom.xml b/extensions/hibernate-orm/deployment/pom.xml
index 6c27713aa8ce3..c29f3597ec255 100644
--- a/extensions/hibernate-orm/deployment/pom.xml
+++ b/extensions/hibernate-orm/deployment/pom.xml
@@ -78,7 +78,7 @@
             <artifactId>quarkus-junit5-internal</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.gizmo</groupId>
+            <groupId>io.quarkus.gizmo</groupId>
             <artifactId>gizmo</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerTest.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerTest.java
index f7f8601aeb42a..f35df2daadabc 100644
--- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerTest.java
+++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/enhancer/HibernateEntityEnhancerTest.java
@@ -24,13 +24,13 @@
 import org.hibernate.engine.spi.ManagedEntity;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 import org.hibernate.engine.spi.SelfDirtinessTracker;
-import org.jboss.protean.gizmo.TestClassLoader;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 
+import io.quarkus.gizmo.TestClassLoader;
 import io.quarkus.hibernate.orm.deployment.HibernateEntityEnhancer;
 
 /**
diff --git a/extensions/panache/panache-jpa/deployment/pom.xml b/extensions/panache/panache-jpa/deployment/pom.xml
index 5b43e6a52f5a6..c1c800d443f11 100644
--- a/extensions/panache/panache-jpa/deployment/pom.xml
+++ b/extensions/panache/panache-jpa/deployment/pom.xml
@@ -60,7 +60,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jboss.gizmo</groupId>
+            <groupId>io.quarkus.gizmo</groupId>
             <artifactId>gizmo</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/extensions/panache/panache-jpa/deployment/src/main/java/io/quarkus/panache/jpa/deployment/PanacheJpaEntityEnhancer.java b/extensions/panache/panache-jpa/deployment/src/main/java/io/quarkus/panache/jpa/deployment/PanacheJpaEntityEnhancer.java
index d4d55aa7e0e51..d499927985201 100644
--- a/extensions/panache/panache-jpa/deployment/src/main/java/io/quarkus/panache/jpa/deployment/PanacheJpaEntityEnhancer.java
+++ b/extensions/panache/panache-jpa/deployment/src/main/java/io/quarkus/panache/jpa/deployment/PanacheJpaEntityEnhancer.java
@@ -12,12 +12,12 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.FieldInfo;
-import org.jboss.protean.gizmo.DescriptorUtils;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
+import io.quarkus.gizmo.DescriptorUtils;
 import io.quarkus.panache.common.Parameters;
 import io.quarkus.panache.common.Sort;
 import io.quarkus.panache.jpa.PanacheEntityBase;
diff --git a/extensions/panache/panache-jpa/deployment/src/main/java/io/quarkus/panache/jpa/deployment/PanacheResourceProcessor.java b/extensions/panache/panache-jpa/deployment/src/main/java/io/quarkus/panache/jpa/deployment/PanacheResourceProcessor.java
index 8da3d5b074c1d..91ef755ba8d4a 100644
--- a/extensions/panache/panache-jpa/deployment/src/main/java/io/quarkus/panache/jpa/deployment/PanacheResourceProcessor.java
+++ b/extensions/panache/panache-jpa/deployment/src/main/java/io/quarkus/panache/jpa/deployment/PanacheResourceProcessor.java
@@ -28,7 +28,6 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.Type;
-import org.jboss.protean.gizmo.ClassOutput;
 
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.processor.BeanInfo;
@@ -38,6 +37,7 @@
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
+import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.hibernate.orm.deployment.AdditionalJpaModelBuildItem;
 import io.quarkus.hibernate.orm.deployment.HibernateEnhancersRegisteredBuildItem;
 import io.quarkus.panache.jpa.PanacheEntity;
@@ -46,6 +46,7 @@
 import io.quarkus.panache.jpa.PanacheRepositoryBase;
 
 /**
+ *
  */
 public final class PanacheResourceProcessor {
 
diff --git a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
index 08986421bb113..379c070cc0b5b 100644
--- a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
+++ b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
@@ -35,11 +35,6 @@
 import org.jboss.jandex.Type;
 import org.jboss.jandex.Type.Kind;
 import org.jboss.logging.Logger;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.quartz.CronExpression;
 import org.quartz.simpl.CascadingClassLoadHelper;
 import org.quartz.simpl.RAMJobStore;
@@ -70,6 +65,11 @@
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
 import io.quarkus.deployment.util.HashUtil;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.scheduler.Scheduled;
 import io.quarkus.scheduler.ScheduledExecution;
 import io.quarkus.scheduler.runtime.QuartzScheduler;
@@ -78,7 +78,6 @@
 import io.quarkus.scheduler.runtime.SchedulerDeploymentTemplate;
 
 /**
- *
  * @author Martin Kouba
  */
 public class SchedulerProcessor {
diff --git a/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java b/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java
index a8a076b65694e..d3f97478254d2 100644
--- a/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java
+++ b/extensions/smallrye-rest-client/deployment/src/main/java/io/quarkus/smallrye/restclient/deployment/SmallRyeRestClientProcessor.java
@@ -32,8 +32,6 @@
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.jboss.resteasy.client.jaxrs.internal.proxy.ProxyBuilderImpl;
 import org.jboss.resteasy.client.jaxrs.internal.proxy.ResteasyClientProxy;
@@ -57,6 +55,8 @@
 import io.quarkus.deployment.builditem.substrate.SubstrateProxyDefinitionBuildItem;
 import io.quarkus.deployment.builditem.substrate.SubstrateResourceBuildItem;
 import io.quarkus.deployment.util.ServiceUtil;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.smallrye.restclient.runtime.RestClientBase;
 import io.quarkus.smallrye.restclient.runtime.RestClientBuilderImpl;
 import io.quarkus.smallrye.restclient.runtime.SmallRyeRestClientTemplate;
diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java
index cf68aa9cc9884..6d0d0ccff4d14 100644
--- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java
+++ b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java
@@ -30,13 +30,6 @@
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.FunctionCreator;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.ArcContainer;
@@ -64,6 +57,13 @@
 import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.substrate.SubstrateConfigBuildItem;
 import io.quarkus.deployment.util.HashUtil;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FunctionCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import io.quarkus.vertx.ConsumeEvent;
 import io.quarkus.vertx.runtime.EventConsumerInvoker;
 import io.quarkus.vertx.runtime.VertxConfiguration;
diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
index 67209979f9512..91b2f2f5ee29b 100644
--- a/independent-projects/arc/pom.xml
+++ b/independent-projects/arc/pom.xml
@@ -49,7 +49,7 @@
     <version.maven>3.5.2</version.maven>
     <version.jboss-logging>3.3.2.Final</version.jboss-logging>
     <version.javax-annotation>1.3.2</version.javax-annotation>
-    <version.gizmo>1.0.0.Alpha1</version.gizmo>
+    <version.gizmo>1.0.0.Alpha2</version.gizmo>
     <version.jpa>2.2</version.jpa>
   </properties>
 
@@ -88,7 +88,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.jboss.gizmo</groupId>
+        <groupId>io.quarkus.gizmo</groupId>
         <artifactId>gizmo</artifactId>
         <version>${version.gizmo}</version>
       </dependency>
diff --git a/independent-projects/arc/processor/pom.xml b/independent-projects/arc/processor/pom.xml
index ab7868d833465..1008b667557a9 100644
--- a/independent-projects/arc/processor/pom.xml
+++ b/independent-projects/arc/processor/pom.xml
@@ -52,7 +52,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.gizmo</groupId>
+      <groupId>io.quarkus.gizmo</groupId>
       <artifactId>gizmo</artifactId>
     </dependency>
 
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java
index e14124a168f1e..957e16816e7f5 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralGenerator.java
@@ -44,13 +44,13 @@
 import io.quarkus.arc.processor.AnnotationLiteralProcessor.Key;
 import io.quarkus.arc.processor.AnnotationLiteralProcessor.Literal;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java
index 7e447d79d07a9..4c9cbfacff451 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationLiteralProcessor.java
@@ -30,10 +30,10 @@
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.MethodInfo;
 import io.quarkus.arc.ComputingCache;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java
index 0304b38f1540c..503fbd23abb0b 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanConfigurator.java
@@ -34,10 +34,10 @@
 import org.jboss.jandex.Type.Kind;
 import io.quarkus.arc.BeanCreator;
 import io.quarkus.arc.BeanDestroyer;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  * Synthetic bean configurator. An alternative to {@link javax.enterprise.inject.spi.configurator.BeanConfigurator}.
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
index 35f5d7a95683c..d4dea1fe7674b 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanGenerator.java
@@ -51,19 +51,19 @@
 import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
-import org.jboss.protean.gizmo.AssignableResultHandle;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.CatchBlockCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.DescriptorUtils;
-import org.jboss.protean.gizmo.FieldCreator;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.FunctionCreator;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-import org.jboss.protean.gizmo.TryBlock;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.CatchBlockCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.DescriptorUtils;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.FunctionCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 
 import io.quarkus.arc.CreationalContextImpl;
 import io.quarkus.arc.CurrentInjectionPointProvider;
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java
index 891bb58a59d67..a3c67576b4c78 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java
@@ -41,7 +41,7 @@
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
 import io.quarkus.arc.processor.Methods.MethodKey;
-import org.jboss.protean.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodCreator;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java
index 8b2e9eec03591..ecba1ecd95d77 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinBean.java
@@ -31,12 +31,12 @@
 import io.quarkus.arc.InstanceProvider;
 import io.quarkus.arc.ResourceProvider;
 import io.quarkus.arc.processor.InjectionPointInfo.InjtetionPointKind;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java
index e5aa5f144b2b4..f3832d7a3ef45 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BuiltinQualifier.java
@@ -22,9 +22,9 @@
 import javax.enterprise.inject.Default;
 
 import org.jboss.jandex.AnnotationInstance;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 enum BuiltinQualifier {
 
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
index e1ae28f8b558c..ef70857dff1da 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java
@@ -41,15 +41,15 @@
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableContext;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
-import org.jboss.protean.gizmo.AssignableResultHandle;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.DescriptorUtils;
-import org.jboss.protean.gizmo.FieldCreator;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.AssignableResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.DescriptorUtils;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java
index f3535e64382b3..472a7d761f6ca 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ComponentsProviderGenerator.java
@@ -36,10 +36,10 @@
 import io.quarkus.arc.InjectableInterceptor;
 import io.quarkus.arc.InjectableReferenceProvider;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import org.objectweb.asm.Type;
 
 /**
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java
index 67de745de4852..3c3c07f55fa90 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorGenerator.java
@@ -40,15 +40,15 @@
 import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
 import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType;
-import org.jboss.protean.gizmo.BranchResult;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.FieldCreator;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.BranchResult;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java
index 542ed6a662d98..e0f3e211582cb 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/MethodDescriptors.java
@@ -45,7 +45,7 @@
 import io.quarkus.arc.InvocationContextImpl.InterceptorInvocation;
 import io.quarkus.arc.LazyValue;
 import io.quarkus.arc.Reflections;
-import org.jboss.protean.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.MethodDescriptor;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java
index 1c65a24ed5093..e95acee2b0a92 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverGenerator.java
@@ -47,13 +47,13 @@
 import io.quarkus.arc.processor.BeanProcessor.PrivateMembersCollector;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
 import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.FieldCreator;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceClassOutput.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceClassOutput.java
index 2d759b32a1261..8b2251aa77b2b 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceClassOutput.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ResourceClassOutput.java
@@ -22,7 +22,7 @@
 
 import io.quarkus.arc.processor.ResourceOutput.Resource;
 import io.quarkus.arc.processor.ResourceOutput.Resource.SpecialType;
-import org.jboss.protean.gizmo.ClassOutput;
+import io.quarkus.gizmo.ClassOutput;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java
index 8971cd0da52be..282510a64acdd 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/SubclassGenerator.java
@@ -46,18 +46,18 @@
 import io.quarkus.arc.Subclass;
 import io.quarkus.arc.processor.BeanInfo.InterceptionInfo;
 import io.quarkus.arc.processor.ResourceOutput.Resource;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.CatchBlockCreator;
-import org.jboss.protean.gizmo.ClassCreator;
-import org.jboss.protean.gizmo.ClassOutput;
-import org.jboss.protean.gizmo.DescriptorUtils;
-import org.jboss.protean.gizmo.FieldCreator;
-import org.jboss.protean.gizmo.FieldDescriptor;
-import org.jboss.protean.gizmo.FunctionCreator;
-import org.jboss.protean.gizmo.MethodCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
-import org.jboss.protean.gizmo.TryBlock;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.CatchBlockCreator;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.DescriptorUtils;
+import io.quarkus.gizmo.FieldCreator;
+import io.quarkus.gizmo.FieldDescriptor;
+import io.quarkus.gizmo.FunctionCreator;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
+import io.quarkus.gizmo.TryBlock;
 
 /**
  *
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java
index bcb825b6f1d38..266d9ad9a46e4 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Types.java
@@ -38,9 +38,9 @@
 import io.quarkus.arc.ParameterizedTypeImpl;
 import io.quarkus.arc.TypeVariableImpl;
 import io.quarkus.arc.WildcardTypeImpl;
-import org.jboss.protean.gizmo.BytecodeCreator;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.BytecodeCreator;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 
 /**
  *
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/build/extension/beans/BeanRegistrarTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/build/extension/beans/BeanRegistrarTest.java
index bcbfc0b0414a2..f00badc2ac848 100644
--- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/build/extension/beans/BeanRegistrarTest.java
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/build/extension/beans/BeanRegistrarTest.java
@@ -29,8 +29,8 @@
 import io.quarkus.arc.processor.BeanConfigurator;
 import io.quarkus.arc.processor.BeanRegistrar;
 import io.quarkus.arc.test.ArcTestContainer;
-import org.jboss.protean.gizmo.MethodDescriptor;
-import org.jboss.protean.gizmo.ResultHandle;
+import io.quarkus.gizmo.MethodDescriptor;
+import io.quarkus.gizmo.ResultHandle;
 import org.junit.Rule;
 import org.junit.Test;