diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogApiConfiguration.java b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogApiConfiguration.java
index f205b97d..378cbd01 100644
--- a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogApiConfiguration.java
+++ b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/DatadogApiConfiguration.java
@@ -141,7 +141,7 @@ public Descriptor<DatadogClientConfiguration> getDescriptor() {
     }
 
     @Extension
-    public static final class DatadogApiConfigurationDescriptor extends DatadogClientConfigurationDescriptor {
+    public static final class DatadogApiConfigurationDescriptor extends DatadogClientConfiguration.DatadogClientConfigurationDescriptor {
         public DatadogApiConfigurationDescriptor() {
             load();
         }
diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntakeSite.java b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntakeSite.java
index 6cd70ab0..985f0456 100644
--- a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntakeSite.java
+++ b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/intake/DatadogIntakeSite.java
@@ -58,7 +58,7 @@ public Descriptor<DatadogIntake> getDescriptor() {
     }
 
     @Extension
-    public static final class DatadogIntakeSiteDescriptor extends DatadogIntakeDescriptor {
+    public static final class DatadogIntakeSiteDescriptor extends DatadogIntake.DatadogIntakeDescriptor {
         public DatadogIntakeSiteDescriptor() {
             load();
         }
diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogCredentialsApiKey.java b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogCredentialsApiKey.java
index 81668eb6..10a32fc1 100644
--- a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogCredentialsApiKey.java
+++ b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogCredentialsApiKey.java
@@ -73,7 +73,7 @@ public Descriptor<DatadogApiKey> getDescriptor() {
     }
 
     @Extension
-    public static final class DatadogCredentialsApiKeyDescriptor extends DatadogApiKeyDescriptor {
+    public static final class DatadogCredentialsApiKeyDescriptor extends DatadogApiKey.DatadogApiKeyDescriptor {
         public DatadogCredentialsApiKeyDescriptor() {
             load();
         }
diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogTextApiKey.java b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogTextApiKey.java
index 75867f21..a649535e 100644
--- a/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogTextApiKey.java
+++ b/src/main/java/org/datadog/jenkins/plugins/datadog/configuration/api/key/DatadogTextApiKey.java
@@ -45,7 +45,7 @@ public Descriptor<DatadogApiKey> getDescriptor() {
     }
 
     @Extension
-    public static final class DatadogTextApiKeyDescriptor extends DatadogApiKeyDescriptor {
+    public static final class DatadogTextApiKeyDescriptor extends DatadogApiKey.DatadogApiKeyDescriptor {
         public DatadogTextApiKeyDescriptor() {
             load();
         }