diff --git a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
index 5b4bf08006..88e819c066 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
@@ -1,6 +1,5 @@
 package com.baeldung.creational.abstractfactory;
 
-public interface AbstractFactory {
-    Animal getAnimal(String toyType) ;
-    Color getColor(String colorType);
+public interface AbstractFactory<T> {
+    T create(String type) ;
 }
\ No newline at end of file
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
index 68759d5aff..c1501091c5 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
@@ -6,10 +6,10 @@ public class AbstractPatternDriver {
         
         //creating a brown toy dog
         abstractFactory = FactoryProvider.getFactory("Toy");
-        Animal toy = abstractFactory.getAnimal("Dog");
+        Animal toy =(Animal) abstractFactory.create("Dog");
         
         abstractFactory = FactoryProvider.getFactory("Color");
-        Color color = abstractFactory.getColor("Brown");
+        Color color =(Color) abstractFactory.create("Brown");
         
         String result = "A " + toy.getType() + " with " + color.getColor() + " color " + toy.makeSound();
         
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
index bbc3eb7a82..4b46261571 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
@@ -1,9 +1,9 @@
 package com.baeldung.creational.abstractfactory;
 
-public class AnimalFactory implements AbstractFactory {
+public class AnimalFactory implements AbstractFactory<Animal> {
 
     @Override
-    public Animal getAnimal(String animalType) {
+    public Animal create(String animalType) {
         if ("Dog".equalsIgnoreCase(animalType)) {
             return new Dog();
         } else if ("Duck".equalsIgnoreCase(animalType)) {
@@ -13,9 +13,4 @@ public class AnimalFactory implements AbstractFactory {
         return null;
     }
 
-    @Override
-    public Color getColor(String color) {
-        throw new UnsupportedOperationException();
-    }
-
 }
diff --git a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
index 8b7e4f8086..3d9c5c18a3 100644
--- a/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
+++ b/patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
@@ -1,9 +1,9 @@
 package com.baeldung.creational.abstractfactory;
 
-public class ColorFactory implements AbstractFactory {
+public class ColorFactory implements AbstractFactory<Color> {
 
     @Override
-    public Color getColor(String colorType) {
+    public Color create(String colorType) {
         if ("Brown".equalsIgnoreCase(colorType)) {
             return new Brown();
         } else if ("White".equalsIgnoreCase(colorType)) {
@@ -13,9 +13,4 @@ public class ColorFactory implements AbstractFactory {
         return null;
     }
 
-    @Override
-    public Animal getAnimal(String toyType) {
-        throw new UnsupportedOperationException();
-    }
-
 }
diff --git a/patterns/design-patterns/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java b/patterns/design-patterns/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
index 6d1a4ad8fd..4f02249a4b 100644
--- a/patterns/design-patterns/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
+++ b/patterns/design-patterns/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
@@ -11,10 +11,10 @@ public class AbstractPatternIntegrationTest {
         
         //creating a brown toy dog
         abstractFactory = FactoryProvider.getFactory("Toy");
-        Animal toy = abstractFactory.getAnimal("Dog");
+        Animal toy = (Animal) abstractFactory.create("Dog");
         
         abstractFactory = FactoryProvider.getFactory("Color");
-        Color color = abstractFactory.getColor("Brown");
+        Color color =(Color) abstractFactory.create("Brown");
         
         String result = "A " + toy.getType() + " with " + color.getColor() + " color " + toy.makeSound();
         assertEquals("A Dog with brown color Barks", result);