diff --git a/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go b/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go
index e284db97aee..ab15827a184 100644
--- a/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go
+++ b/kubernetes-model-generator/openapi/generator/pkg/parser/parser.go
@@ -124,11 +124,11 @@ func resolveType(typ *types.Type) string {
 	isList := false
 	isObject := false
 	for _, m := range typ.Members {
-		if m.Type.Name == listMeta {
+		if m.Embedded == true && m.Type.Name == listMeta {
 			isList = true
 			// stop iterating, if it's a list then it's not an object
 			break
-		} else if m.Type.Name == typeMeta {
+		} else if m.Embedded == true && m.Type.Name == typeMeta {
 			isObject = true
 			// keep iterating, maybe it's a list
 		}
diff --git a/kubernetes-model-generator/openapi/schemas/openshift-generated.json b/kubernetes-model-generator/openapi/schemas/openshift-generated.json
index 1107d57b5e1..70bad48f44a 100644
--- a/kubernetes-model-generator/openapi/schemas/openshift-generated.json
+++ b/kubernetes-model-generator/openapi/schemas/openshift-generated.json
@@ -34178,7 +34178,7 @@
         }
       },
       "x-fabric8-info": {
-        "Type": "object",
+        "Type": "nested",
         "Group": "console.openshift.io",
         "Version": "v1",
         "Kind": "ConsoleYAMLSampleSpec",
diff --git a/kubernetes-model-generator/openshift-model-console/pom.xml b/kubernetes-model-generator/openshift-model-console/pom.xml
index e85debcf077..9de38176276 100644
--- a/kubernetes-model-generator/openshift-model-console/pom.xml
+++ b/kubernetes-model-generator/openshift-model-console/pom.xml
@@ -60,12 +60,8 @@
             <configuration >
               <settings combine.self="append">
                 <schemas>
-                  <schema>${openapi.schema.openshift-latest}</schema>
+                  <schema>${openapi.schema.openshift-generated}</schema>
                 </schemas>
-                <packageMappings combine.self="append">
-                  <io.k8s.api>io.fabric8.kubernetes.api.model</io.k8s.api>
-                  <io.openshift.console>io.fabric8.openshift.api.model.console</io.openshift.console>
-                </packageMappings>
                 <includeGenerationRegexes>
                   <includeGenerationRegex>^io\.openshift\.console\..*$</includeGenerationRegex>
                 </includeGenerationRegexes>
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecApplicationMenu.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ApplicationMenuSpec.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecApplicationMenu.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ApplicationMenuSpec.java
index 3ec042b050d..4a92dab03ef 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecApplicationMenu.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ApplicationMenuSpec.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleLinkSpecApplicationMenu implements Editable<ConsoleLinkSpecApplicationMenuBuilder> , KubernetesResource
+public class ApplicationMenuSpec implements Editable<ApplicationMenuSpecBuilder> , KubernetesResource
 {
 
     @JsonProperty("imageURL")
@@ -66,10 +66,10 @@ public class ConsoleLinkSpecApplicationMenu implements Editable<ConsoleLinkSpecA
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleLinkSpecApplicationMenu() {
+    public ApplicationMenuSpec() {
     }
 
-    public ConsoleLinkSpecApplicationMenu(String imageURL, String section) {
+    public ApplicationMenuSpec(String imageURL, String section) {
         super();
         this.imageURL = imageURL;
         this.section = section;
@@ -96,12 +96,12 @@ public void setSection(String section) {
     }
 
     @JsonIgnore
-    public ConsoleLinkSpecApplicationMenuBuilder edit() {
-        return new ConsoleLinkSpecApplicationMenuBuilder(this);
+    public ApplicationMenuSpecBuilder edit() {
+        return new ApplicationMenuSpecBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleLinkSpecApplicationMenuBuilder toBuilder() {
+    public ApplicationMenuSpecBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownloadSpecLinks.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/CLIDownloadLink.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownloadSpecLinks.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/CLIDownloadLink.java
index 6bc887f38ae..b2741ba33ff 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownloadSpecLinks.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/CLIDownloadLink.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleCLIDownloadSpecLinks implements Editable<ConsoleCLIDownloadSpecLinksBuilder> , KubernetesResource
+public class CLIDownloadLink implements Editable<CLIDownloadLinkBuilder> , KubernetesResource
 {
 
     @JsonProperty("href")
@@ -66,10 +66,10 @@ public class ConsoleCLIDownloadSpecLinks implements Editable<ConsoleCLIDownloadS
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleCLIDownloadSpecLinks() {
+    public CLIDownloadLink() {
     }
 
-    public ConsoleCLIDownloadSpecLinks(String href, String text) {
+    public CLIDownloadLink(String href, String text) {
         super();
         this.href = href;
         this.text = text;
@@ -96,12 +96,12 @@ public void setText(String text) {
     }
 
     @JsonIgnore
-    public ConsoleCLIDownloadSpecLinksBuilder edit() {
-        return new ConsoleCLIDownloadSpecLinksBuilder(this);
+    public CLIDownloadLinkBuilder edit() {
+        return new CLIDownloadLinkBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleCLIDownloadSpecLinksBuilder toBuilder() {
+    public CLIDownloadLinkBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownloadSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownloadSpec.java
index f9760ad53a3..08abf5e5973 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownloadSpec.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownloadSpec.java
@@ -64,7 +64,7 @@ public class ConsoleCLIDownloadSpec implements Editable<ConsoleCLIDownloadSpecBu
     private String displayName;
     @JsonProperty("links")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ConsoleCLIDownloadSpecLinks> links = new ArrayList<>();
+    private List<CLIDownloadLink> links = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -75,7 +75,7 @@ public class ConsoleCLIDownloadSpec implements Editable<ConsoleCLIDownloadSpecBu
     public ConsoleCLIDownloadSpec() {
     }
 
-    public ConsoleCLIDownloadSpec(String description, String displayName, List<ConsoleCLIDownloadSpecLinks> links) {
+    public ConsoleCLIDownloadSpec(String description, String displayName, List<CLIDownloadLink> links) {
         super();
         this.description = description;
         this.displayName = displayName;
@@ -104,12 +104,12 @@ public void setDisplayName(String displayName) {
 
     @JsonProperty("links")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ConsoleCLIDownloadSpecLinks> getLinks() {
+    public List<CLIDownloadLink> getLinks() {
         return links;
     }
 
     @JsonProperty("links")
-    public void setLinks(List<ConsoleCLIDownloadSpecLinks> links) {
+    public void setLinks(List<CLIDownloadLink> links) {
         this.links = links;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpec.java
index 8fb7fb1c9e4..307319dc17d 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpec.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpec.java
@@ -59,13 +59,13 @@ public class ConsoleLinkSpec implements Editable<ConsoleLinkSpecBuilder> , Kuber
 {
 
     @JsonProperty("applicationMenu")
-    private ConsoleLinkSpecApplicationMenu applicationMenu;
+    private ApplicationMenuSpec applicationMenu;
     @JsonProperty("href")
     private String href;
     @JsonProperty("location")
     private String location;
     @JsonProperty("namespaceDashboard")
-    private ConsoleLinkSpecNamespaceDashboard namespaceDashboard;
+    private NamespaceDashboardSpec namespaceDashboard;
     @JsonProperty("text")
     private String text;
     @JsonIgnore
@@ -78,7 +78,7 @@ public class ConsoleLinkSpec implements Editable<ConsoleLinkSpecBuilder> , Kuber
     public ConsoleLinkSpec() {
     }
 
-    public ConsoleLinkSpec(ConsoleLinkSpecApplicationMenu applicationMenu, String href, String location, ConsoleLinkSpecNamespaceDashboard namespaceDashboard, String text) {
+    public ConsoleLinkSpec(ApplicationMenuSpec applicationMenu, String href, String location, NamespaceDashboardSpec namespaceDashboard, String text) {
         super();
         this.applicationMenu = applicationMenu;
         this.href = href;
@@ -88,12 +88,12 @@ public ConsoleLinkSpec(ConsoleLinkSpecApplicationMenu applicationMenu, String hr
     }
 
     @JsonProperty("applicationMenu")
-    public ConsoleLinkSpecApplicationMenu getApplicationMenu() {
+    public ApplicationMenuSpec getApplicationMenu() {
         return applicationMenu;
     }
 
     @JsonProperty("applicationMenu")
-    public void setApplicationMenu(ConsoleLinkSpecApplicationMenu applicationMenu) {
+    public void setApplicationMenu(ApplicationMenuSpec applicationMenu) {
         this.applicationMenu = applicationMenu;
     }
 
@@ -118,12 +118,12 @@ public void setLocation(String location) {
     }
 
     @JsonProperty("namespaceDashboard")
-    public ConsoleLinkSpecNamespaceDashboard getNamespaceDashboard() {
+    public NamespaceDashboardSpec getNamespaceDashboard() {
         return namespaceDashboard;
     }
 
     @JsonProperty("namespaceDashboard")
-    public void setNamespaceDashboard(ConsoleLinkSpecNamespaceDashboard namespaceDashboard) {
+    public void setNamespaceDashboard(NamespaceDashboardSpec namespaceDashboard) {
         this.namespaceDashboard = namespaceDashboard;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecNDNamespaceSelector.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecNDNamespaceSelector.java
deleted file mode 100644
index 28124301674..00000000000
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecNDNamespaceSelector.java
+++ /dev/null
@@ -1,129 +0,0 @@
-
-package io.fabric8.openshift.api.model.console.v1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "matchExpressions",
-    "matchLabels"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ConsoleLinkSpecNDNamespaceSelector implements Editable<ConsoleLinkSpecNDNamespaceSelectorBuilder> , KubernetesResource
-{
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<LabelSelectorRequirement> matchExpressions = new ArrayList<>();
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private Map<String, String> matchLabels = new LinkedHashMap<>();
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ConsoleLinkSpecNDNamespaceSelector() {
-    }
-
-    public ConsoleLinkSpecNDNamespaceSelector(List<LabelSelectorRequirement> matchExpressions, Map<String, String> matchLabels) {
-        super();
-        this.matchExpressions = matchExpressions;
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonProperty("matchExpressions")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<LabelSelectorRequirement> getMatchExpressions() {
-        return matchExpressions;
-    }
-
-    @JsonProperty("matchExpressions")
-    public void setMatchExpressions(List<LabelSelectorRequirement> matchExpressions) {
-        this.matchExpressions = matchExpressions;
-    }
-
-    @JsonProperty("matchLabels")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public Map<String, String> getMatchLabels() {
-        return matchLabels;
-    }
-
-    @JsonProperty("matchLabels")
-    public void setMatchLabels(Map<String, String> matchLabels) {
-        this.matchLabels = matchLabels;
-    }
-
-    @JsonIgnore
-    public ConsoleLinkSpecNDNamespaceSelectorBuilder edit() {
-        return new ConsoleLinkSpecNDNamespaceSelectorBuilder(this);
-    }
-
-    @JsonIgnore
-    public ConsoleLinkSpecNDNamespaceSelectorBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotificationSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotificationSpec.java
index 332a9c89219..5e6549aa089 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotificationSpec.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotificationSpec.java
@@ -63,7 +63,7 @@ public class ConsoleNotificationSpec implements Editable<ConsoleNotificationSpec
     @JsonProperty("color")
     private String color;
     @JsonProperty("link")
-    private ConsoleNotificationSpecLink link;
+    private Link link;
     @JsonProperty("location")
     private String location;
     @JsonProperty("text")
@@ -78,7 +78,7 @@ public class ConsoleNotificationSpec implements Editable<ConsoleNotificationSpec
     public ConsoleNotificationSpec() {
     }
 
-    public ConsoleNotificationSpec(String backgroundColor, String color, ConsoleNotificationSpecLink link, String location, String text) {
+    public ConsoleNotificationSpec(String backgroundColor, String color, Link link, String location, String text) {
         super();
         this.backgroundColor = backgroundColor;
         this.color = color;
@@ -108,12 +108,12 @@ public void setColor(String color) {
     }
 
     @JsonProperty("link")
-    public ConsoleNotificationSpecLink getLink() {
+    public Link getLink() {
         return link;
     }
 
     @JsonProperty("link")
-    public void setLink(ConsoleNotificationSpecLink link) {
+    public void setLink(Link link) {
         this.link = link;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecBackend.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginBackend.java
similarity index 85%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecBackend.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginBackend.java
index ab8d095e95d..4a4f83081a1 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecBackend.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginBackend.java
@@ -52,11 +52,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsolePluginSpecBackend implements Editable<ConsolePluginSpecBackendBuilder> , KubernetesResource
+public class ConsolePluginBackend implements Editable<ConsolePluginBackendBuilder> , KubernetesResource
 {
 
     @JsonProperty("service")
-    private ConsolePluginSpecBService service;
+    private ConsolePluginService service;
     @JsonProperty("type")
     private String type;
     @JsonIgnore
@@ -66,22 +66,22 @@ public class ConsolePluginSpecBackend implements Editable<ConsolePluginSpecBacke
      * No args constructor for use in serialization
      * 
      */
-    public ConsolePluginSpecBackend() {
+    public ConsolePluginBackend() {
     }
 
-    public ConsolePluginSpecBackend(ConsolePluginSpecBService service, String type) {
+    public ConsolePluginBackend(ConsolePluginService service, String type) {
         super();
         this.service = service;
         this.type = type;
     }
 
     @JsonProperty("service")
-    public ConsolePluginSpecBService getService() {
+    public ConsolePluginService getService() {
         return service;
     }
 
     @JsonProperty("service")
-    public void setService(ConsolePluginSpecBService service) {
+    public void setService(ConsolePluginService service) {
         this.service = service;
     }
 
@@ -96,12 +96,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public ConsolePluginSpecBackendBuilder edit() {
-        return new ConsolePluginSpecBackendBuilder(this);
+    public ConsolePluginBackendBuilder edit() {
+        return new ConsolePluginBackendBuilder(this);
     }
 
     @JsonIgnore
-    public ConsolePluginSpecBackendBuilder toBuilder() {
+    public ConsolePluginBackendBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecI18n.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginI18n.java
similarity index 90%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecI18n.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginI18n.java
index f9835116cdd..fb3c1e3216c 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecI18n.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginI18n.java
@@ -51,7 +51,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsolePluginSpecI18n implements Editable<ConsolePluginSpecI18nBuilder> , KubernetesResource
+public class ConsolePluginI18n implements Editable<ConsolePluginI18nBuilder> , KubernetesResource
 {
 
     @JsonProperty("loadType")
@@ -63,10 +63,10 @@ public class ConsolePluginSpecI18n implements Editable<ConsolePluginSpecI18nBuil
      * No args constructor for use in serialization
      * 
      */
-    public ConsolePluginSpecI18n() {
+    public ConsolePluginI18n() {
     }
 
-    public ConsolePluginSpecI18n(String loadType) {
+    public ConsolePluginI18n(String loadType) {
         super();
         this.loadType = loadType;
     }
@@ -82,12 +82,12 @@ public void setLoadType(String loadType) {
     }
 
     @JsonIgnore
-    public ConsolePluginSpecI18nBuilder edit() {
-        return new ConsolePluginSpecI18nBuilder(this);
+    public ConsolePluginI18nBuilder edit() {
+        return new ConsolePluginI18nBuilder(this);
     }
 
     @JsonIgnore
-    public ConsolePluginSpecI18nBuilder toBuilder() {
+    public ConsolePluginI18nBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecProxy.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxy.java
similarity index 87%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecProxy.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxy.java
index 25b087f1634..af2d7a7f1f8 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecProxy.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxy.java
@@ -54,7 +54,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsolePluginSpecProxy implements Editable<ConsolePluginSpecProxyBuilder> , KubernetesResource
+public class ConsolePluginProxy implements Editable<ConsolePluginProxyBuilder> , KubernetesResource
 {
 
     @JsonProperty("alias")
@@ -64,7 +64,7 @@ public class ConsolePluginSpecProxy implements Editable<ConsolePluginSpecProxyBu
     @JsonProperty("caCertificate")
     private String caCertificate;
     @JsonProperty("endpoint")
-    private ConsolePluginSpecPEndpoint endpoint;
+    private ConsolePluginProxyEndpoint endpoint;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -72,10 +72,10 @@ public class ConsolePluginSpecProxy implements Editable<ConsolePluginSpecProxyBu
      * No args constructor for use in serialization
      * 
      */
-    public ConsolePluginSpecProxy() {
+    public ConsolePluginProxy() {
     }
 
-    public ConsolePluginSpecProxy(String alias, String authorization, String caCertificate, ConsolePluginSpecPEndpoint endpoint) {
+    public ConsolePluginProxy(String alias, String authorization, String caCertificate, ConsolePluginProxyEndpoint endpoint) {
         super();
         this.alias = alias;
         this.authorization = authorization;
@@ -114,22 +114,22 @@ public void setCaCertificate(String caCertificate) {
     }
 
     @JsonProperty("endpoint")
-    public ConsolePluginSpecPEndpoint getEndpoint() {
+    public ConsolePluginProxyEndpoint getEndpoint() {
         return endpoint;
     }
 
     @JsonProperty("endpoint")
-    public void setEndpoint(ConsolePluginSpecPEndpoint endpoint) {
+    public void setEndpoint(ConsolePluginProxyEndpoint endpoint) {
         this.endpoint = endpoint;
     }
 
     @JsonIgnore
-    public ConsolePluginSpecProxyBuilder edit() {
-        return new ConsolePluginSpecProxyBuilder(this);
+    public ConsolePluginProxyBuilder edit() {
+        return new ConsolePluginProxyBuilder(this);
     }
 
     @JsonIgnore
-    public ConsolePluginSpecProxyBuilder toBuilder() {
+    public ConsolePluginProxyBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecPEndpoint.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxyEndpoint.java
similarity index 84%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecPEndpoint.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxyEndpoint.java
index c6396b77292..f610ff3cceb 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecPEndpoint.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxyEndpoint.java
@@ -52,11 +52,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsolePluginSpecPEndpoint implements Editable<ConsolePluginSpecPEndpointBuilder> , KubernetesResource
+public class ConsolePluginProxyEndpoint implements Editable<ConsolePluginProxyEndpointBuilder> , KubernetesResource
 {
 
     @JsonProperty("service")
-    private ConsolePluginSpecPEService service;
+    private ConsolePluginProxyServiceConfig service;
     @JsonProperty("type")
     private String type;
     @JsonIgnore
@@ -66,22 +66,22 @@ public class ConsolePluginSpecPEndpoint implements Editable<ConsolePluginSpecPEn
      * No args constructor for use in serialization
      * 
      */
-    public ConsolePluginSpecPEndpoint() {
+    public ConsolePluginProxyEndpoint() {
     }
 
-    public ConsolePluginSpecPEndpoint(ConsolePluginSpecPEService service, String type) {
+    public ConsolePluginProxyEndpoint(ConsolePluginProxyServiceConfig service, String type) {
         super();
         this.service = service;
         this.type = type;
     }
 
     @JsonProperty("service")
-    public ConsolePluginSpecPEService getService() {
+    public ConsolePluginProxyServiceConfig getService() {
         return service;
     }
 
     @JsonProperty("service")
-    public void setService(ConsolePluginSpecPEService service) {
+    public void setService(ConsolePluginProxyServiceConfig service) {
         this.service = service;
     }
 
@@ -96,12 +96,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public ConsolePluginSpecPEndpointBuilder edit() {
-        return new ConsolePluginSpecPEndpointBuilder(this);
+    public ConsolePluginProxyEndpointBuilder edit() {
+        return new ConsolePluginProxyEndpointBuilder(this);
     }
 
     @JsonIgnore
-    public ConsolePluginSpecPEndpointBuilder toBuilder() {
+    public ConsolePluginProxyEndpointBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecPEService.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxyServiceConfig.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecPEService.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxyServiceConfig.java
index fff23684444..9382a18b3e2 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecPEService.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginProxyServiceConfig.java
@@ -53,7 +53,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsolePluginSpecPEService implements Editable<ConsolePluginSpecPEServiceBuilder> , KubernetesResource
+public class ConsolePluginProxyServiceConfig implements Editable<ConsolePluginProxyServiceConfigBuilder> , KubernetesResource
 {
 
     @JsonProperty("name")
@@ -69,10 +69,10 @@ public class ConsolePluginSpecPEService implements Editable<ConsolePluginSpecPES
      * No args constructor for use in serialization
      * 
      */
-    public ConsolePluginSpecPEService() {
+    public ConsolePluginProxyServiceConfig() {
     }
 
-    public ConsolePluginSpecPEService(String name, String namespace, Integer port) {
+    public ConsolePluginProxyServiceConfig(String name, String namespace, Integer port) {
         super();
         this.name = name;
         this.namespace = namespace;
@@ -110,12 +110,12 @@ public void setPort(Integer port) {
     }
 
     @JsonIgnore
-    public ConsolePluginSpecPEServiceBuilder edit() {
-        return new ConsolePluginSpecPEServiceBuilder(this);
+    public ConsolePluginProxyServiceConfigBuilder edit() {
+        return new ConsolePluginProxyServiceConfigBuilder(this);
     }
 
     @JsonIgnore
-    public ConsolePluginSpecPEServiceBuilder toBuilder() {
+    public ConsolePluginProxyServiceConfigBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecBService.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginService.java
similarity index 90%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecBService.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginService.java
index 152189d2cd0..d1ca83bb964 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpecBService.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginService.java
@@ -54,7 +54,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsolePluginSpecBService implements Editable<ConsolePluginSpecBServiceBuilder> , KubernetesResource
+public class ConsolePluginService implements Editable<ConsolePluginServiceBuilder> , KubernetesResource
 {
 
     @JsonProperty("basePath")
@@ -72,10 +72,10 @@ public class ConsolePluginSpecBService implements Editable<ConsolePluginSpecBSer
      * No args constructor for use in serialization
      * 
      */
-    public ConsolePluginSpecBService() {
+    public ConsolePluginService() {
     }
 
-    public ConsolePluginSpecBService(String basePath, String name, String namespace, Integer port) {
+    public ConsolePluginService(String basePath, String name, String namespace, Integer port) {
         super();
         this.basePath = basePath;
         this.name = name;
@@ -124,12 +124,12 @@ public void setPort(Integer port) {
     }
 
     @JsonIgnore
-    public ConsolePluginSpecBServiceBuilder edit() {
-        return new ConsolePluginSpecBServiceBuilder(this);
+    public ConsolePluginServiceBuilder edit() {
+        return new ConsolePluginServiceBuilder(this);
     }
 
     @JsonIgnore
-    public ConsolePluginSpecBServiceBuilder toBuilder() {
+    public ConsolePluginServiceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpec.java
index 6edb443ce37..618b6ed32ab 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpec.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsolePluginSpec.java
@@ -60,14 +60,14 @@ public class ConsolePluginSpec implements Editable<ConsolePluginSpecBuilder> , K
 {
 
     @JsonProperty("backend")
-    private ConsolePluginSpecBackend backend;
+    private ConsolePluginBackend backend;
     @JsonProperty("displayName")
     private String displayName;
     @JsonProperty("i18n")
-    private ConsolePluginSpecI18n i18n;
+    private ConsolePluginI18n i18n;
     @JsonProperty("proxy")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ConsolePluginSpecProxy> proxy = new ArrayList<>();
+    private List<ConsolePluginProxy> proxy = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -78,7 +78,7 @@ public class ConsolePluginSpec implements Editable<ConsolePluginSpecBuilder> , K
     public ConsolePluginSpec() {
     }
 
-    public ConsolePluginSpec(ConsolePluginSpecBackend backend, String displayName, ConsolePluginSpecI18n i18n, List<ConsolePluginSpecProxy> proxy) {
+    public ConsolePluginSpec(ConsolePluginBackend backend, String displayName, ConsolePluginI18n i18n, List<ConsolePluginProxy> proxy) {
         super();
         this.backend = backend;
         this.displayName = displayName;
@@ -87,12 +87,12 @@ public ConsolePluginSpec(ConsolePluginSpecBackend backend, String displayName, C
     }
 
     @JsonProperty("backend")
-    public ConsolePluginSpecBackend getBackend() {
+    public ConsolePluginBackend getBackend() {
         return backend;
     }
 
     @JsonProperty("backend")
-    public void setBackend(ConsolePluginSpecBackend backend) {
+    public void setBackend(ConsolePluginBackend backend) {
         this.backend = backend;
     }
 
@@ -107,23 +107,23 @@ public void setDisplayName(String displayName) {
     }
 
     @JsonProperty("i18n")
-    public ConsolePluginSpecI18n getI18n() {
+    public ConsolePluginI18n getI18n() {
         return i18n;
     }
 
     @JsonProperty("i18n")
-    public void setI18n(ConsolePluginSpecI18n i18n) {
+    public void setI18n(ConsolePluginI18n i18n) {
         this.i18n = i18n;
     }
 
     @JsonProperty("proxy")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ConsolePluginSpecProxy> getProxy() {
+    public List<ConsolePluginProxy> getProxy() {
         return proxy;
     }
 
     @JsonProperty("proxy")
-    public void setProxy(List<ConsolePluginSpecProxy> proxy) {
+    public void setProxy(List<ConsolePluginProxy> proxy) {
         this.proxy = proxy;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpec.java
index a51938423e2..826342c0934 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpec.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpec.java
@@ -93,7 +93,7 @@ public class ConsoleQuickStartSpec implements Editable<ConsoleQuickStartSpecBuil
     private List<String> tags = new ArrayList<>();
     @JsonProperty("tasks")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ConsoleQuickStartSpecTasks> tasks = new ArrayList<>();
+    private List<ConsoleQuickStartTask> tasks = new ArrayList<>();
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -104,7 +104,7 @@ public class ConsoleQuickStartSpec implements Editable<ConsoleQuickStartSpecBuil
     public ConsoleQuickStartSpec() {
     }
 
-    public ConsoleQuickStartSpec(List<ResourceAttributes> accessReviewResources, String conclusion, String description, String displayName, Integer durationMinutes, String icon, String introduction, List<String> nextQuickStart, List<String> prerequisites, List<String> tags, List<ConsoleQuickStartSpecTasks> tasks) {
+    public ConsoleQuickStartSpec(List<ResourceAttributes> accessReviewResources, String conclusion, String description, String displayName, Integer durationMinutes, String icon, String introduction, List<String> nextQuickStart, List<String> prerequisites, List<String> tags, List<ConsoleQuickStartTask> tasks) {
         super();
         this.accessReviewResources = accessReviewResources;
         this.conclusion = conclusion;
@@ -225,12 +225,12 @@ public void setTags(List<String> tags) {
 
     @JsonProperty("tasks")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ConsoleQuickStartSpecTasks> getTasks() {
+    public List<ConsoleQuickStartTask> getTasks() {
         return tasks;
     }
 
     @JsonProperty("tasks")
-    public void setTasks(List<ConsoleQuickStartSpecTasks> tasks) {
+    public void setTasks(List<ConsoleQuickStartTask> tasks) {
         this.tasks = tasks;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTasks.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTask.java
similarity index 82%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTasks.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTask.java
index 277915a2392..e5159488d55 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTasks.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTask.java
@@ -54,15 +54,15 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleQuickStartSpecTasks implements Editable<ConsoleQuickStartSpecTasksBuilder> , KubernetesResource
+public class ConsoleQuickStartTask implements Editable<ConsoleQuickStartTaskBuilder> , KubernetesResource
 {
 
     @JsonProperty("description")
     private String description;
     @JsonProperty("review")
-    private ConsoleQuickStartSpecTReview review;
+    private ConsoleQuickStartTaskReview review;
     @JsonProperty("summary")
-    private ConsoleQuickStartSpecTSummary summary;
+    private ConsoleQuickStartTaskSummary summary;
     @JsonProperty("title")
     private String title;
     @JsonIgnore
@@ -72,10 +72,10 @@ public class ConsoleQuickStartSpecTasks implements Editable<ConsoleQuickStartSpe
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleQuickStartSpecTasks() {
+    public ConsoleQuickStartTask() {
     }
 
-    public ConsoleQuickStartSpecTasks(String description, ConsoleQuickStartSpecTReview review, ConsoleQuickStartSpecTSummary summary, String title) {
+    public ConsoleQuickStartTask(String description, ConsoleQuickStartTaskReview review, ConsoleQuickStartTaskSummary summary, String title) {
         super();
         this.description = description;
         this.review = review;
@@ -94,22 +94,22 @@ public void setDescription(String description) {
     }
 
     @JsonProperty("review")
-    public ConsoleQuickStartSpecTReview getReview() {
+    public ConsoleQuickStartTaskReview getReview() {
         return review;
     }
 
     @JsonProperty("review")
-    public void setReview(ConsoleQuickStartSpecTReview review) {
+    public void setReview(ConsoleQuickStartTaskReview review) {
         this.review = review;
     }
 
     @JsonProperty("summary")
-    public ConsoleQuickStartSpecTSummary getSummary() {
+    public ConsoleQuickStartTaskSummary getSummary() {
         return summary;
     }
 
     @JsonProperty("summary")
-    public void setSummary(ConsoleQuickStartSpecTSummary summary) {
+    public void setSummary(ConsoleQuickStartTaskSummary summary) {
         this.summary = summary;
     }
 
@@ -124,12 +124,12 @@ public void setTitle(String title) {
     }
 
     @JsonIgnore
-    public ConsoleQuickStartSpecTasksBuilder edit() {
-        return new ConsoleQuickStartSpecTasksBuilder(this);
+    public ConsoleQuickStartTaskBuilder edit() {
+        return new ConsoleQuickStartTaskBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleQuickStartSpecTasksBuilder toBuilder() {
+    public ConsoleQuickStartTaskBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTReview.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTaskReview.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTReview.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTaskReview.java
index d3192c692a2..335d364f31a 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTReview.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTaskReview.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleQuickStartSpecTReview implements Editable<ConsoleQuickStartSpecTReviewBuilder> , KubernetesResource
+public class ConsoleQuickStartTaskReview implements Editable<ConsoleQuickStartTaskReviewBuilder> , KubernetesResource
 {
 
     @JsonProperty("failedTaskHelp")
@@ -66,10 +66,10 @@ public class ConsoleQuickStartSpecTReview implements Editable<ConsoleQuickStartS
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleQuickStartSpecTReview() {
+    public ConsoleQuickStartTaskReview() {
     }
 
-    public ConsoleQuickStartSpecTReview(String failedTaskHelp, String instructions) {
+    public ConsoleQuickStartTaskReview(String failedTaskHelp, String instructions) {
         super();
         this.failedTaskHelp = failedTaskHelp;
         this.instructions = instructions;
@@ -96,12 +96,12 @@ public void setInstructions(String instructions) {
     }
 
     @JsonIgnore
-    public ConsoleQuickStartSpecTReviewBuilder edit() {
-        return new ConsoleQuickStartSpecTReviewBuilder(this);
+    public ConsoleQuickStartTaskReviewBuilder edit() {
+        return new ConsoleQuickStartTaskReviewBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleQuickStartSpecTReviewBuilder toBuilder() {
+    public ConsoleQuickStartTaskReviewBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTSummary.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTaskSummary.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTSummary.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTaskSummary.java
index 21f25f76859..1604435f92d 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartSpecTSummary.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStartTaskSummary.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleQuickStartSpecTSummary implements Editable<ConsoleQuickStartSpecTSummaryBuilder> , KubernetesResource
+public class ConsoleQuickStartTaskSummary implements Editable<ConsoleQuickStartTaskSummaryBuilder> , KubernetesResource
 {
 
     @JsonProperty("failed")
@@ -66,10 +66,10 @@ public class ConsoleQuickStartSpecTSummary implements Editable<ConsoleQuickStart
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleQuickStartSpecTSummary() {
+    public ConsoleQuickStartTaskSummary() {
     }
 
-    public ConsoleQuickStartSpecTSummary(String failed, String success) {
+    public ConsoleQuickStartTaskSummary(String failed, String success) {
         super();
         this.failed = failed;
         this.success = success;
@@ -96,12 +96,12 @@ public void setSuccess(String success) {
     }
 
     @JsonIgnore
-    public ConsoleQuickStartSpecTSummaryBuilder edit() {
-        return new ConsoleQuickStartSpecTSummaryBuilder(this);
+    public ConsoleQuickStartTaskSummaryBuilder edit() {
+        return new ConsoleQuickStartTaskSummaryBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleQuickStartSpecTSummaryBuilder toBuilder() {
+    public ConsoleQuickStartTaskSummaryBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSContainerImport.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleContainerImportSource.java
similarity index 82%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSContainerImport.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleContainerImportSource.java
index f395183cbe9..df0c70f862e 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSContainerImport.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleContainerImportSource.java
@@ -52,13 +52,13 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleSampleSpecSContainerImport implements Editable<ConsoleSampleSpecSContainerImportBuilder> , KubernetesResource
+public class ConsoleSampleContainerImportSource implements Editable<ConsoleSampleContainerImportSourceBuilder> , KubernetesResource
 {
 
     @JsonProperty("image")
     private String image;
     @JsonProperty("service")
-    private ConsoleSampleSpecSCIService service;
+    private ConsoleSampleContainerImportSourceService service;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -66,10 +66,10 @@ public class ConsoleSampleSpecSContainerImport implements Editable<ConsoleSample
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleSampleSpecSContainerImport() {
+    public ConsoleSampleContainerImportSource() {
     }
 
-    public ConsoleSampleSpecSContainerImport(String image, ConsoleSampleSpecSCIService service) {
+    public ConsoleSampleContainerImportSource(String image, ConsoleSampleContainerImportSourceService service) {
         super();
         this.image = image;
         this.service = service;
@@ -86,22 +86,22 @@ public void setImage(String image) {
     }
 
     @JsonProperty("service")
-    public ConsoleSampleSpecSCIService getService() {
+    public ConsoleSampleContainerImportSourceService getService() {
         return service;
     }
 
     @JsonProperty("service")
-    public void setService(ConsoleSampleSpecSCIService service) {
+    public void setService(ConsoleSampleContainerImportSourceService service) {
         this.service = service;
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSContainerImportBuilder edit() {
-        return new ConsoleSampleSpecSContainerImportBuilder(this);
+    public ConsoleSampleContainerImportSourceBuilder edit() {
+        return new ConsoleSampleContainerImportSourceBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSContainerImportBuilder toBuilder() {
+    public ConsoleSampleContainerImportSourceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSCIService.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleContainerImportSourceService.java
similarity index 86%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSCIService.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleContainerImportSourceService.java
index db484965ded..115a2ff4bfa 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSCIService.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleContainerImportSourceService.java
@@ -51,7 +51,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleSampleSpecSCIService implements Editable<ConsoleSampleSpecSCIServiceBuilder> , KubernetesResource
+public class ConsoleSampleContainerImportSourceService implements Editable<ConsoleSampleContainerImportSourceServiceBuilder> , KubernetesResource
 {
 
     @JsonProperty("targetPort")
@@ -63,10 +63,10 @@ public class ConsoleSampleSpecSCIService implements Editable<ConsoleSampleSpecSC
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleSampleSpecSCIService() {
+    public ConsoleSampleContainerImportSourceService() {
     }
 
-    public ConsoleSampleSpecSCIService(Integer targetPort) {
+    public ConsoleSampleContainerImportSourceService(Integer targetPort) {
         super();
         this.targetPort = targetPort;
     }
@@ -82,12 +82,12 @@ public void setTargetPort(Integer targetPort) {
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSCIServiceBuilder edit() {
-        return new ConsoleSampleSpecSCIServiceBuilder(this);
+    public ConsoleSampleContainerImportSourceServiceBuilder edit() {
+        return new ConsoleSampleContainerImportSourceServiceBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSCIServiceBuilder toBuilder() {
+    public ConsoleSampleContainerImportSourceServiceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGitImport.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSource.java
similarity index 79%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGitImport.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSource.java
index 9f8950ba235..2bcb2223e85 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGitImport.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSource.java
@@ -52,13 +52,13 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleSampleSpecSGitImport implements Editable<ConsoleSampleSpecSGitImportBuilder> , KubernetesResource
+public class ConsoleSampleGitImportSource implements Editable<ConsoleSampleGitImportSourceBuilder> , KubernetesResource
 {
 
     @JsonProperty("repository")
-    private ConsoleSampleSpecSGIRepository repository;
+    private ConsoleSampleGitImportSourceRepository repository;
     @JsonProperty("service")
-    private ConsoleSampleSpecSGIService service;
+    private ConsoleSampleGitImportSourceService service;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
 
@@ -66,42 +66,42 @@ public class ConsoleSampleSpecSGitImport implements Editable<ConsoleSampleSpecSG
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleSampleSpecSGitImport() {
+    public ConsoleSampleGitImportSource() {
     }
 
-    public ConsoleSampleSpecSGitImport(ConsoleSampleSpecSGIRepository repository, ConsoleSampleSpecSGIService service) {
+    public ConsoleSampleGitImportSource(ConsoleSampleGitImportSourceRepository repository, ConsoleSampleGitImportSourceService service) {
         super();
         this.repository = repository;
         this.service = service;
     }
 
     @JsonProperty("repository")
-    public ConsoleSampleSpecSGIRepository getRepository() {
+    public ConsoleSampleGitImportSourceRepository getRepository() {
         return repository;
     }
 
     @JsonProperty("repository")
-    public void setRepository(ConsoleSampleSpecSGIRepository repository) {
+    public void setRepository(ConsoleSampleGitImportSourceRepository repository) {
         this.repository = repository;
     }
 
     @JsonProperty("service")
-    public ConsoleSampleSpecSGIService getService() {
+    public ConsoleSampleGitImportSourceService getService() {
         return service;
     }
 
     @JsonProperty("service")
-    public void setService(ConsoleSampleSpecSGIService service) {
+    public void setService(ConsoleSampleGitImportSourceService service) {
         this.service = service;
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSGitImportBuilder edit() {
-        return new ConsoleSampleSpecSGitImportBuilder(this);
+    public ConsoleSampleGitImportSourceBuilder edit() {
+        return new ConsoleSampleGitImportSourceBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSGitImportBuilder toBuilder() {
+    public ConsoleSampleGitImportSourceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGIRepository.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSourceRepository.java
similarity index 88%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGIRepository.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSourceRepository.java
index 8f5f23363de..cf1ad89ea91 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGIRepository.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSourceRepository.java
@@ -53,7 +53,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleSampleSpecSGIRepository implements Editable<ConsoleSampleSpecSGIRepositoryBuilder> , KubernetesResource
+public class ConsoleSampleGitImportSourceRepository implements Editable<ConsoleSampleGitImportSourceRepositoryBuilder> , KubernetesResource
 {
 
     @JsonProperty("contextDir")
@@ -69,10 +69,10 @@ public class ConsoleSampleSpecSGIRepository implements Editable<ConsoleSampleSpe
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleSampleSpecSGIRepository() {
+    public ConsoleSampleGitImportSourceRepository() {
     }
 
-    public ConsoleSampleSpecSGIRepository(String contextDir, String revision, String url) {
+    public ConsoleSampleGitImportSourceRepository(String contextDir, String revision, String url) {
         super();
         this.contextDir = contextDir;
         this.revision = revision;
@@ -110,12 +110,12 @@ public void setUrl(String url) {
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSGIRepositoryBuilder edit() {
-        return new ConsoleSampleSpecSGIRepositoryBuilder(this);
+    public ConsoleSampleGitImportSourceRepositoryBuilder edit() {
+        return new ConsoleSampleGitImportSourceRepositoryBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSGIRepositoryBuilder toBuilder() {
+    public ConsoleSampleGitImportSourceRepositoryBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGIService.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSourceService.java
similarity index 87%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGIService.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSourceService.java
index f196afd54c4..855c57dd593 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSGIService.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleGitImportSourceService.java
@@ -51,7 +51,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleSampleSpecSGIService implements Editable<ConsoleSampleSpecSGIServiceBuilder> , KubernetesResource
+public class ConsoleSampleGitImportSourceService implements Editable<ConsoleSampleGitImportSourceServiceBuilder> , KubernetesResource
 {
 
     @JsonProperty("targetPort")
@@ -63,10 +63,10 @@ public class ConsoleSampleSpecSGIService implements Editable<ConsoleSampleSpecSG
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleSampleSpecSGIService() {
+    public ConsoleSampleGitImportSourceService() {
     }
 
-    public ConsoleSampleSpecSGIService(Integer targetPort) {
+    public ConsoleSampleGitImportSourceService(Integer targetPort) {
         super();
         this.targetPort = targetPort;
     }
@@ -82,12 +82,12 @@ public void setTargetPort(Integer targetPort) {
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSGIServiceBuilder edit() {
-        return new ConsoleSampleSpecSGIServiceBuilder(this);
+    public ConsoleSampleGitImportSourceServiceBuilder edit() {
+        return new ConsoleSampleGitImportSourceServiceBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSGIServiceBuilder toBuilder() {
+    public ConsoleSampleGitImportSourceServiceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSource.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSource.java
similarity index 81%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSource.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSource.java
index 29d0e3deede..e0fe099d1f3 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpecSource.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSource.java
@@ -53,13 +53,13 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleSampleSpecSource implements Editable<ConsoleSampleSpecSourceBuilder> , KubernetesResource
+public class ConsoleSampleSource implements Editable<ConsoleSampleSourceBuilder> , KubernetesResource
 {
 
     @JsonProperty("containerImport")
-    private ConsoleSampleSpecSContainerImport containerImport;
+    private ConsoleSampleContainerImportSource containerImport;
     @JsonProperty("gitImport")
-    private ConsoleSampleSpecSGitImport gitImport;
+    private ConsoleSampleGitImportSource gitImport;
     @JsonProperty("type")
     private String type;
     @JsonIgnore
@@ -69,10 +69,10 @@ public class ConsoleSampleSpecSource implements Editable<ConsoleSampleSpecSource
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleSampleSpecSource() {
+    public ConsoleSampleSource() {
     }
 
-    public ConsoleSampleSpecSource(ConsoleSampleSpecSContainerImport containerImport, ConsoleSampleSpecSGitImport gitImport, String type) {
+    public ConsoleSampleSource(ConsoleSampleContainerImportSource containerImport, ConsoleSampleGitImportSource gitImport, String type) {
         super();
         this.containerImport = containerImport;
         this.gitImport = gitImport;
@@ -80,22 +80,22 @@ public ConsoleSampleSpecSource(ConsoleSampleSpecSContainerImport containerImport
     }
 
     @JsonProperty("containerImport")
-    public ConsoleSampleSpecSContainerImport getContainerImport() {
+    public ConsoleSampleContainerImportSource getContainerImport() {
         return containerImport;
     }
 
     @JsonProperty("containerImport")
-    public void setContainerImport(ConsoleSampleSpecSContainerImport containerImport) {
+    public void setContainerImport(ConsoleSampleContainerImportSource containerImport) {
         this.containerImport = containerImport;
     }
 
     @JsonProperty("gitImport")
-    public ConsoleSampleSpecSGitImport getGitImport() {
+    public ConsoleSampleGitImportSource getGitImport() {
         return gitImport;
     }
 
     @JsonProperty("gitImport")
-    public void setGitImport(ConsoleSampleSpecSGitImport gitImport) {
+    public void setGitImport(ConsoleSampleGitImportSource gitImport) {
         this.gitImport = gitImport;
     }
 
@@ -110,12 +110,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSourceBuilder edit() {
-        return new ConsoleSampleSpecSourceBuilder(this);
+    public ConsoleSampleSourceBuilder edit() {
+        return new ConsoleSampleSourceBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleSampleSpecSourceBuilder toBuilder() {
+    public ConsoleSampleSourceBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpec.java
index 2faae522c35..6bd6cc0d1d0 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpec.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleSampleSpec.java
@@ -72,7 +72,7 @@ public class ConsoleSampleSpec implements Editable<ConsoleSampleSpecBuilder> , K
     @JsonProperty("provider")
     private String provider;
     @JsonProperty("source")
-    private ConsoleSampleSpecSource source;
+    private ConsoleSampleSource source;
     @JsonProperty("tags")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> tags = new ArrayList<>();
@@ -90,7 +90,7 @@ public class ConsoleSampleSpec implements Editable<ConsoleSampleSpecBuilder> , K
     public ConsoleSampleSpec() {
     }
 
-    public ConsoleSampleSpec(String _abstract, String description, String icon, String provider, ConsoleSampleSpecSource source, List<String> tags, String title, String type) {
+    public ConsoleSampleSpec(String _abstract, String description, String icon, String provider, ConsoleSampleSource source, List<String> tags, String title, String type) {
         super();
         this._abstract = _abstract;
         this.description = description;
@@ -143,12 +143,12 @@ public void setProvider(String provider) {
     }
 
     @JsonProperty("source")
-    public ConsoleSampleSpecSource getSource() {
+    public ConsoleSampleSource getSource() {
         return source;
     }
 
     @JsonProperty("source")
-    public void setSource(ConsoleSampleSpecSource source) {
+    public void setSource(ConsoleSampleSource source) {
         this.source = source;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSampleSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSampleSpec.java
index 41d612f9134..ecb41988d87 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSampleSpec.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSampleSpec.java
@@ -22,6 +22,7 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.api.model.TypeMeta;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
@@ -63,7 +64,7 @@ public class ConsoleYAMLSampleSpec implements Editable<ConsoleYAMLSampleSpecBuil
     @JsonProperty("snippet")
     private Boolean snippet;
     @JsonProperty("targetResource")
-    private ConsoleYAMLSampleSpecTargetResource targetResource;
+    private TypeMeta targetResource;
     @JsonProperty("title")
     private String title;
     @JsonProperty("yaml")
@@ -78,7 +79,7 @@ public class ConsoleYAMLSampleSpec implements Editable<ConsoleYAMLSampleSpecBuil
     public ConsoleYAMLSampleSpec() {
     }
 
-    public ConsoleYAMLSampleSpec(String description, Boolean snippet, ConsoleYAMLSampleSpecTargetResource targetResource, String title, String yaml) {
+    public ConsoleYAMLSampleSpec(String description, Boolean snippet, TypeMeta targetResource, String title, String yaml) {
         super();
         this.description = description;
         this.snippet = snippet;
@@ -108,12 +109,12 @@ public void setSnippet(Boolean snippet) {
     }
 
     @JsonProperty("targetResource")
-    public ConsoleYAMLSampleSpecTargetResource getTargetResource() {
+    public TypeMeta getTargetResource() {
         return targetResource;
     }
 
     @JsonProperty("targetResource")
-    public void setTargetResource(ConsoleYAMLSampleSpecTargetResource targetResource) {
+    public void setTargetResource(TypeMeta targetResource) {
         this.targetResource = targetResource;
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSampleSpecTargetResource.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSampleSpecTargetResource.java
deleted file mode 100644
index 92ba2cd1368..00000000000
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSampleSpecTargetResource.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-package io.fabric8.openshift.api.model.console.v1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "kind"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ConsoleYAMLSampleSpecTargetResource implements Editable<ConsoleYAMLSampleSpecTargetResourceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("apiVersion")
-    private String apiVersion;
-    @JsonProperty("kind")
-    private String kind;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ConsoleYAMLSampleSpecTargetResource() {
-    }
-
-    public ConsoleYAMLSampleSpecTargetResource(String apiVersion, String kind) {
-        super();
-        this.apiVersion = apiVersion;
-        this.kind = kind;
-    }
-
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return apiVersion;
-    }
-
-    @JsonProperty("apiVersion")
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonIgnore
-    public ConsoleYAMLSampleSpecTargetResourceBuilder edit() {
-        return new ConsoleYAMLSampleSpecTargetResourceBuilder(this);
-    }
-
-    @JsonIgnore
-    public ConsoleYAMLSampleSpecTargetResourceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotificationSpecLink.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/Link.java
similarity index 89%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotificationSpecLink.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/Link.java
index adde9f1663c..1318ce54464 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotificationSpecLink.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/Link.java
@@ -52,7 +52,7 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleNotificationSpecLink implements Editable<ConsoleNotificationSpecLinkBuilder> , KubernetesResource
+public class Link implements Editable<LinkBuilder> , KubernetesResource
 {
 
     @JsonProperty("href")
@@ -66,10 +66,10 @@ public class ConsoleNotificationSpecLink implements Editable<ConsoleNotification
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleNotificationSpecLink() {
+    public Link() {
     }
 
-    public ConsoleNotificationSpecLink(String href, String text) {
+    public Link(String href, String text) {
         super();
         this.href = href;
         this.text = text;
@@ -96,12 +96,12 @@ public void setText(String text) {
     }
 
     @JsonIgnore
-    public ConsoleNotificationSpecLinkBuilder edit() {
-        return new ConsoleNotificationSpecLinkBuilder(this);
+    public LinkBuilder edit() {
+        return new LinkBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleNotificationSpecLinkBuilder toBuilder() {
+    public LinkBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecNamespaceDashboard.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/NamespaceDashboardSpec.java
similarity index 83%
rename from kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecNamespaceDashboard.java
rename to kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/NamespaceDashboardSpec.java
index b3a9a6e847d..7a1588a5b6c 100644
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLinkSpecNamespaceDashboard.java
+++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/NamespaceDashboardSpec.java
@@ -54,11 +54,11 @@
     @BuildableReference(PersistentVolumeClaim.class)
 })
 @Generated("jsonschema2pojo")
-public class ConsoleLinkSpecNamespaceDashboard implements Editable<ConsoleLinkSpecNamespaceDashboardBuilder> , KubernetesResource
+public class NamespaceDashboardSpec implements Editable<NamespaceDashboardSpecBuilder> , KubernetesResource
 {
 
     @JsonProperty("namespaceSelector")
-    private ConsoleLinkSpecNDNamespaceSelector namespaceSelector;
+    private LabelSelector namespaceSelector;
     @JsonProperty("namespaces")
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> namespaces = new ArrayList<>();
@@ -69,22 +69,22 @@ public class ConsoleLinkSpecNamespaceDashboard implements Editable<ConsoleLinkSp
      * No args constructor for use in serialization
      * 
      */
-    public ConsoleLinkSpecNamespaceDashboard() {
+    public NamespaceDashboardSpec() {
     }
 
-    public ConsoleLinkSpecNamespaceDashboard(ConsoleLinkSpecNDNamespaceSelector namespaceSelector, List<String> namespaces) {
+    public NamespaceDashboardSpec(LabelSelector namespaceSelector, List<String> namespaces) {
         super();
         this.namespaceSelector = namespaceSelector;
         this.namespaces = namespaces;
     }
 
     @JsonProperty("namespaceSelector")
-    public ConsoleLinkSpecNDNamespaceSelector getNamespaceSelector() {
+    public LabelSelector getNamespaceSelector() {
         return namespaceSelector;
     }
 
     @JsonProperty("namespaceSelector")
-    public void setNamespaceSelector(ConsoleLinkSpecNDNamespaceSelector namespaceSelector) {
+    public void setNamespaceSelector(LabelSelector namespaceSelector) {
         this.namespaceSelector = namespaceSelector;
     }
 
@@ -100,12 +100,12 @@ public void setNamespaces(List<String> namespaces) {
     }
 
     @JsonIgnore
-    public ConsoleLinkSpecNamespaceDashboardBuilder edit() {
-        return new ConsoleLinkSpecNamespaceDashboardBuilder(this);
+    public NamespaceDashboardSpecBuilder edit() {
+        return new NamespaceDashboardSpecBuilder(this);
     }
 
     @JsonIgnore
-    public ConsoleLinkSpecNamespaceDashboardBuilder toBuilder() {
+    public NamespaceDashboardSpecBuilder toBuilder() {
         return edit();
     }
 
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java
deleted file mode 100644
index 402bfffb0c4..00000000000
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java
+++ /dev/null
@@ -1,189 +0,0 @@
-
-package io.fabric8.openshift.api.model.console.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.model.annotation.Group;
-import io.fabric8.kubernetes.model.annotation.Version;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import io.sundr.transform.annotations.TemplateTransformation;
-import io.sundr.transform.annotations.TemplateTransformations;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "kind",
-    "metadata",
-    "spec"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@TemplateTransformations({
-    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
-})
-@Version("v1alpha1")
-@Group("console.openshift.io")
-@Generated("jsonschema2pojo")
-public class ConsolePlugin implements Editable<ConsolePluginBuilder> , HasMetadata
-{
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    private String apiVersion = "console.openshift.io/v1alpha1";
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    private String kind = "ConsolePlugin";
-    @JsonProperty("metadata")
-    private ObjectMeta metadata;
-    @JsonProperty("spec")
-    private ConsolePluginSpec spec;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ConsolePlugin() {
-    }
-
-    public ConsolePlugin(String apiVersion, String kind, ObjectMeta metadata, ConsolePluginSpec spec) {
-        super();
-        this.apiVersion = apiVersion;
-        this.kind = kind;
-        this.metadata = metadata;
-        this.spec = spec;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return apiVersion;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("metadata")
-    public ObjectMeta getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    public void setMetadata(ObjectMeta metadata) {
-        this.metadata = metadata;
-    }
-
-    @JsonProperty("spec")
-    public ConsolePluginSpec getSpec() {
-        return spec;
-    }
-
-    @JsonProperty("spec")
-    public void setSpec(ConsolePluginSpec spec) {
-        this.spec = spec;
-    }
-
-    @JsonIgnore
-    public ConsolePluginBuilder edit() {
-        return new ConsolePluginBuilder(this);
-    }
-
-    @JsonIgnore
-    public ConsolePluginBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginList.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginList.java
deleted file mode 100644
index 134d4fafbb5..00000000000
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginList.java
+++ /dev/null
@@ -1,195 +0,0 @@
-
-package io.fabric8.openshift.api.model.console.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.KubernetesResourceList;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.ListMeta;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.model.annotation.Group;
-import io.fabric8.kubernetes.model.annotation.Version;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import io.sundr.transform.annotations.TemplateTransformation;
-import io.sundr.transform.annotations.TemplateTransformations;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "apiVersion",
-    "kind",
-    "metadata",
-    "items"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@TemplateTransformations({
-    @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
-})
-@Version("v1alpha1")
-@Group("console.openshift.io")
-@Generated("jsonschema2pojo")
-public class ConsolePluginList implements Editable<ConsolePluginListBuilder> , KubernetesResource, KubernetesResourceList<io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin>
-{
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    private String apiVersion = "console.openshift.io/v1alpha1";
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin> items = new ArrayList<>();
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    private String kind = "ConsolePluginList";
-    @JsonProperty("metadata")
-    private ListMeta metadata;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ConsolePluginList() {
-    }
-
-    public ConsolePluginList(String apiVersion, List<io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin> items, String kind, ListMeta metadata) {
-        super();
-        this.apiVersion = apiVersion;
-        this.items = items;
-        this.kind = kind;
-        this.metadata = metadata;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return apiVersion;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("apiVersion")
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-
-    @JsonProperty("items")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin> getItems() {
-        return items;
-    }
-
-    @JsonProperty("items")
-    public void setItems(List<io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin> items) {
-        this.items = items;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    public String getKind() {
-        return kind;
-    }
-
-    /**
-     * 
-     * (Required)
-     * 
-     */
-    @JsonProperty("kind")
-    public void setKind(String kind) {
-        this.kind = kind;
-    }
-
-    @JsonProperty("metadata")
-    public ListMeta getMetadata() {
-        return metadata;
-    }
-
-    @JsonProperty("metadata")
-    public void setMetadata(ListMeta metadata) {
-        this.metadata = metadata;
-    }
-
-    @JsonIgnore
-    public ConsolePluginListBuilder edit() {
-        return new ConsolePluginListBuilder(this);
-    }
-
-    @JsonIgnore
-    public ConsolePluginListBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpec.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpec.java
deleted file mode 100644
index c2df69c173e..00000000000
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpec.java
+++ /dev/null
@@ -1,140 +0,0 @@
-
-package io.fabric8.openshift.api.model.console.v1alpha1;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "displayName",
-    "proxy",
-    "service"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ConsolePluginSpec implements Editable<ConsolePluginSpecBuilder> , KubernetesResource
-{
-
-    @JsonProperty("displayName")
-    private String displayName;
-    @JsonProperty("proxy")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ConsolePluginSpecProxy> proxy = new ArrayList<>();
-    @JsonProperty("service")
-    private ConsolePluginSpecService service;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ConsolePluginSpec() {
-    }
-
-    public ConsolePluginSpec(String displayName, List<ConsolePluginSpecProxy> proxy, ConsolePluginSpecService service) {
-        super();
-        this.displayName = displayName;
-        this.proxy = proxy;
-        this.service = service;
-    }
-
-    @JsonProperty("displayName")
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    @JsonProperty("displayName")
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    @JsonProperty("proxy")
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public List<ConsolePluginSpecProxy> getProxy() {
-        return proxy;
-    }
-
-    @JsonProperty("proxy")
-    public void setProxy(List<ConsolePluginSpecProxy> proxy) {
-        this.proxy = proxy;
-    }
-
-    @JsonProperty("service")
-    public ConsolePluginSpecService getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(ConsolePluginSpecService service) {
-        this.service = service;
-    }
-
-    @JsonIgnore
-    public ConsolePluginSpecBuilder edit() {
-        return new ConsolePluginSpecBuilder(this);
-    }
-
-    @JsonIgnore
-    public ConsolePluginSpecBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecPService.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecPService.java
deleted file mode 100644
index 63577cfaaa6..00000000000
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecPService.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package io.fabric8.openshift.api.model.console.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "namespace",
-    "port"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ConsolePluginSpecPService implements Editable<ConsolePluginSpecPServiceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("namespace")
-    private String namespace;
-    @JsonProperty("port")
-    private Integer port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ConsolePluginSpecPService() {
-    }
-
-    public ConsolePluginSpecPService(String name, String namespace, Integer port) {
-        super();
-        this.name = name;
-        this.namespace = namespace;
-        this.port = port;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("namespace")
-    public String getNamespace() {
-        return namespace;
-    }
-
-    @JsonProperty("namespace")
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ConsolePluginSpecPServiceBuilder edit() {
-        return new ConsolePluginSpecPServiceBuilder(this);
-    }
-
-    @JsonIgnore
-    public ConsolePluginSpecPServiceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecProxy.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecProxy.java
deleted file mode 100644
index c9813687217..00000000000
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecProxy.java
+++ /dev/null
@@ -1,164 +0,0 @@
-
-package io.fabric8.openshift.api.model.console.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "alias",
-    "authorize",
-    "caCertificate",
-    "service",
-    "type"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ConsolePluginSpecProxy implements Editable<ConsolePluginSpecProxyBuilder> , KubernetesResource
-{
-
-    @JsonProperty("alias")
-    private String alias;
-    @JsonProperty("authorize")
-    private Boolean authorize;
-    @JsonProperty("caCertificate")
-    private String caCertificate;
-    @JsonProperty("service")
-    private ConsolePluginSpecPService service;
-    @JsonProperty("type")
-    private String type;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ConsolePluginSpecProxy() {
-    }
-
-    public ConsolePluginSpecProxy(String alias, Boolean authorize, String caCertificate, ConsolePluginSpecPService service, String type) {
-        super();
-        this.alias = alias;
-        this.authorize = authorize;
-        this.caCertificate = caCertificate;
-        this.service = service;
-        this.type = type;
-    }
-
-    @JsonProperty("alias")
-    public String getAlias() {
-        return alias;
-    }
-
-    @JsonProperty("alias")
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
-
-    @JsonProperty("authorize")
-    public Boolean getAuthorize() {
-        return authorize;
-    }
-
-    @JsonProperty("authorize")
-    public void setAuthorize(Boolean authorize) {
-        this.authorize = authorize;
-    }
-
-    @JsonProperty("caCertificate")
-    public String getCaCertificate() {
-        return caCertificate;
-    }
-
-    @JsonProperty("caCertificate")
-    public void setCaCertificate(String caCertificate) {
-        this.caCertificate = caCertificate;
-    }
-
-    @JsonProperty("service")
-    public ConsolePluginSpecPService getService() {
-        return service;
-    }
-
-    @JsonProperty("service")
-    public void setService(ConsolePluginSpecPService service) {
-        this.service = service;
-    }
-
-    @JsonProperty("type")
-    public String getType() {
-        return type;
-    }
-
-    @JsonProperty("type")
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @JsonIgnore
-    public ConsolePluginSpecProxyBuilder edit() {
-        return new ConsolePluginSpecProxyBuilder(this);
-    }
-
-    @JsonIgnore
-    public ConsolePluginSpecProxyBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecService.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecService.java
deleted file mode 100644
index d426aecce87..00000000000
--- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePluginSpecService.java
+++ /dev/null
@@ -1,150 +0,0 @@
-
-package io.fabric8.openshift.api.model.console.v1alpha1;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.annotation.Generated;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
-import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "basePath",
-    "name",
-    "namespace",
-    "port"
-})
-@ToString
-@EqualsAndHashCode
-@Accessors(prefix = {
-    "_",
-    ""
-})
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
-@Generated("jsonschema2pojo")
-public class ConsolePluginSpecService implements Editable<ConsolePluginSpecServiceBuilder> , KubernetesResource
-{
-
-    @JsonProperty("basePath")
-    private String basePath;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("namespace")
-    private String namespace;
-    @JsonProperty("port")
-    private Integer port;
-    @JsonIgnore
-    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
-
-    /**
-     * No args constructor for use in serialization
-     * 
-     */
-    public ConsolePluginSpecService() {
-    }
-
-    public ConsolePluginSpecService(String basePath, String name, String namespace, Integer port) {
-        super();
-        this.basePath = basePath;
-        this.name = name;
-        this.namespace = namespace;
-        this.port = port;
-    }
-
-    @JsonProperty("basePath")
-    public String getBasePath() {
-        return basePath;
-    }
-
-    @JsonProperty("basePath")
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
-    }
-
-    @JsonProperty("name")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty("name")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonProperty("namespace")
-    public String getNamespace() {
-        return namespace;
-    }
-
-    @JsonProperty("namespace")
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    @JsonProperty("port")
-    public Integer getPort() {
-        return port;
-    }
-
-    @JsonProperty("port")
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    @JsonIgnore
-    public ConsolePluginSpecServiceBuilder edit() {
-        return new ConsolePluginSpecServiceBuilder(this);
-    }
-
-    @JsonIgnore
-    public ConsolePluginSpecServiceBuilder toBuilder() {
-        return edit();
-    }
-
-    @JsonAnyGetter
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    @JsonAnySetter
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-}
diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsolePluginTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsolePluginTest.java
index c1b7a29bec8..82f14cdd19e 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsolePluginTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsolePluginTest.java
@@ -15,10 +15,10 @@
  */
 package io.fabric8.openshift.client.server.mock;
 
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin;
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginBuilder;
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginList;
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginListBuilder;
+import io.fabric8.openshift.api.model.console.v1.ConsolePlugin;
+import io.fabric8.openshift.api.model.console.v1.ConsolePluginBuilder;
+import io.fabric8.openshift.api.model.console.v1.ConsolePluginList;
+import io.fabric8.openshift.api.model.console.v1.ConsolePluginListBuilder;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.junit.jupiter.api.Test;
 
@@ -34,7 +34,7 @@ class ConsolePluginTest {
   @Test
   void get() {
     // Given
-    server.expect().get().withPath("/apis/console.openshift.io/v1alpha1/consoleplugins/test-get")
+    server.expect().get().withPath("/apis/console.openshift.io/v1/consoleplugins/test-get")
         .andReturn(HttpURLConnection.HTTP_OK, createNewConsolePlugin("test-get"))
         .once();
 
@@ -50,7 +50,7 @@ void get() {
   @Test
   void list() {
     // Given
-    server.expect().get().withPath("/apis/console.openshift.io/v1alpha1/consoleplugins")
+    server.expect().get().withPath("/apis/console.openshift.io/v1/consoleplugins")
         .andReturn(HttpURLConnection.HTTP_OK, new ConsolePluginListBuilder()
             .addToItems(createNewConsolePlugin("test-list"))
             .build())
@@ -69,7 +69,7 @@ void list() {
   @Test
   void delete() {
     // Given
-    server.expect().delete().withPath("/apis/console.openshift.io/v1alpha1/consoleplugins/cluster")
+    server.expect().delete().withPath("/apis/console.openshift.io/v1/consoleplugins/cluster")
         .andReturn(HttpURLConnection.HTTP_OK, createNewConsolePlugin("cluster"))
         .once();
 
@@ -85,12 +85,14 @@ private ConsolePlugin createNewConsolePlugin(String name) {
         .withNewMetadata().withName(name).endMetadata()
         .withNewSpec()
         .withDisplayName("Dev Sandbox Console Plugin")
+        .withNewBackend()
         .withNewService()
         .withBasePath("/")
         .withName("dev-sandbox-console-plugin")
         .withNamespace("dev-sandbox-console-plugin")
         .withPort(9001)
         .endService()
+        .endBackend()
         .endSpec()
         .build();
   }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleQuickStartTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleQuickStartTest.java
index 0562abaf886..3e01345f394 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleQuickStartTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleQuickStartTest.java
@@ -19,7 +19,7 @@
 import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartBuilder;
 import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartListBuilder;
-import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartSpecTasksBuilder;
+import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartTaskBuilder;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.junit.jupiter.api.Test;
 
@@ -89,7 +89,7 @@ private ConsoleQuickStart createNewConsoleQuickStart(String name) {
         .withDescription("Now that you’ve created a sample application and added health checks,\n" +
             "    let’s monitor your application.")
         .withDisplayName("Test Monitor your application")
-        .withTasks(new ConsoleQuickStartSpecTasksBuilder()
+        .withTasks(new ConsoleQuickStartTaskBuilder()
             .withDescription("Console Quickstart task")
             .withTitle("test console quickstart")
             .build())
diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java
index 2fe57a9f5b9..ba19f3efc46 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftResourcesTest.java
@@ -70,9 +70,9 @@
 import io.fabric8.openshift.api.model.console.v1.ConsoleExternalLogLink;
 import io.fabric8.openshift.api.model.console.v1.ConsoleLink;
 import io.fabric8.openshift.api.model.console.v1.ConsoleNotification;
+import io.fabric8.openshift.api.model.console.v1.ConsolePlugin;
 import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStart;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample;
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin;
 import io.fabric8.openshift.api.model.machine.v1beta1.Machine;
 import io.fabric8.openshift.api.model.machine.v1beta1.MachineSet;
 import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfig;
@@ -133,7 +133,7 @@ private static Stream<Arguments> argumentProvider() {
         Arguments.of(ConsoleExternalLogLink.class, false, "console.openshift.io", "v1", "consoleexternalloglinks"),
         Arguments.of(ConsoleLink.class, false, "console.openshift.io", "v1", "consolelinks"),
         Arguments.of(ConsoleNotification.class, false, "console.openshift.io", "v1", "consolenotifications"),
-        Arguments.of(ConsolePlugin.class, false, "console.openshift.io", "v1alpha1", "consoleplugins"),
+        Arguments.of(ConsolePlugin.class, false, "console.openshift.io", "v1", "consoleplugins"),
         Arguments.of(ConsoleQuickStart.class, false, "console.openshift.io", "v1", "consolequickstarts"),
         Arguments.of(ConsoleYAMLSample.class, false, "console.openshift.io", "v1", "consoleyamlsamples"),
         Arguments.of(APIServer.class, false, "config.openshift.io", "v1", "apiservers"),
diff --git a/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConsoleAPIGroupDSL.java b/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConsoleAPIGroupDSL.java
index 60723245596..d2be07c854a 100644
--- a/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConsoleAPIGroupDSL.java
+++ b/openshift-client-api/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConsoleAPIGroupDSL.java
@@ -26,12 +26,12 @@
 import io.fabric8.openshift.api.model.console.v1.ConsoleLinkList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleNotification;
 import io.fabric8.openshift.api.model.console.v1.ConsoleNotificationList;
+import io.fabric8.openshift.api.model.console.v1.ConsolePlugin;
+import io.fabric8.openshift.api.model.console.v1.ConsolePluginList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStart;
 import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSampleList;
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin;
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginList;
 
 public interface OpenShiftConsoleAPIGroupDSL extends Client {
   /**
@@ -77,7 +77,7 @@ public interface OpenShiftConsoleAPIGroupDSL extends Client {
   NonNamespaceOperation<ConsoleQuickStart, ConsoleQuickStartList, Resource<ConsoleQuickStart>> consoleQuickStarts();
 
   /**
-   * DSL entrypoint for ConsolePlugin (console.openshift.io/v1alpha1
+   * DSL entrypoint for ConsolePlugin (console.openshift.io/v1
    *
    * @return NonNamespaceOperation object for ConsolePlugin
    */
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftConsoleAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftConsoleAPIGroupClient.java
index f940caa06f3..ec1650975c6 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftConsoleAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftConsoleAPIGroupClient.java
@@ -26,12 +26,12 @@
 import io.fabric8.openshift.api.model.console.v1.ConsoleLinkList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleNotification;
 import io.fabric8.openshift.api.model.console.v1.ConsoleNotificationList;
+import io.fabric8.openshift.api.model.console.v1.ConsolePlugin;
+import io.fabric8.openshift.api.model.console.v1.ConsolePluginList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStart;
 import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSampleList;
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePlugin;
-import io.fabric8.openshift.api.model.console.v1alpha1.ConsolePluginList;
 import io.fabric8.openshift.client.dsl.OpenShiftConsoleAPIGroupDSL;
 
 public class OpenShiftConsoleAPIGroupClient extends ClientAdapter<OpenShiftConsoleAPIGroupClient>