diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 8126bd8..952f144 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.kernicpanel</groupId>
   <artifactId>randomizer</artifactId>
   <name>Randomizer</name>
-  <version>2.0</version>
+  <version>2.1</version>
   <build>
     <plugins>
       <plugin>
diff --git a/pom.xml b/pom.xml
index 037d59e..694a338 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>randomizer</artifactId>
     <packaging>jar</packaging>
     <name>Randomizer</name>
-    <version>2.0</version>
+    <version>2.1</version>
 
     <repositories>
         <repository>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>net.datafaker</groupId>
             <artifactId>datafaker</artifactId>
-            <version>1.4.0</version>
+            <version>1.7.0</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/com/kernicpanel/RandomizerExtension.java b/src/main/java/com/kernicpanel/RandomizerExtension.java
index 0210cbe..857228d 100644
--- a/src/main/java/com/kernicpanel/RandomizerExtension.java
+++ b/src/main/java/com/kernicpanel/RandomizerExtension.java
@@ -128,18 +128,83 @@ private NoArgsCallback selectRandomItem() {
 
   private NoArgsCallback randomName() {
     return () -> {
-      String[] moods = {faker.mood().emotion(), faker.mood().tone(), faker.mood().feeling()};
-      String mood = moods[rand.nextInt(moods.length)];
+      String[] prefixes = {
+          faker.mood().emotion(),
+          faker.mood().tone(),
+          faker.mood().feeling(),
+          faker.color().name(),
+          faker.coffee().intensifier(),
+          faker.company().buzzword(),
+          faker.dungeonsAndDragons().languages(),
+          faker.size().adjective(),
+          faker.subscription().subscriptionTerms(),
+      };
+//      printer(Arrays.toString(prefixes));
+      String prefix = prefixes[rand.nextInt(prefixes.length)];
 
       String[] names = {
-        faker.superhero().power(),
-        faker.hacker().ingverb(),
-        faker.hacker().noun(),
-        faker.hacker().verb(),
+//          faker.superhero().power(),
+//          faker.superhero().name(),
+          faker.hacker().ingverb(),
+          faker.hacker().noun(),
+          faker.hacker().verb(),
+          faker.food().fruit(),
+          faker.food().ingredient(),
+          faker.food().vegetable(),
+          faker.verb().ingForm(),
+          faker.verb().past(),
+          faker.verb().pastParticiple(),
+          faker.appliance().equipment(),
+          faker.coffee().body(),
+          faker.darkSoul().classes(),
+          faker.darkSoul().stats(),
+          faker.pokemon().type(),
+          faker.dessert().flavor(),
       };
+//      printer(Arrays.toString(names));
       String name = names[rand.nextInt(names.length)];
 
-      String[] generators = {mood, name};
+      String[] suffixes = {
+          faker.animal().name(),
+          faker.weather().description(),
+          faker.address().streetSuffix(),
+          faker.address().citySuffix(),
+          faker.battlefield1().classes(),
+          faker.coffee().descriptor(),
+          faker.company().profession(),
+          faker.construction().heavyEquipment(),
+          faker.construction().materials(),
+          faker.cosmere().shards(),
+          faker.cosmere().surges(),
+          faker.cosmere().knightsRadiant(),
+          faker.cosmere().metals(),
+          faker.cosmere().allomancers(),
+          faker.cosmere().feruchemists(),
+          faker.dessert().variety(),
+          faker.dessert().topping(),
+          faker.dungeonsAndDragons().klasses(),
+          faker.dungeonsAndDragons().meleeWeapons(),
+          faker.dungeonsAndDragons().monsters(),
+          faker.dungeonsAndDragons().races(),
+          faker.dungeonsAndDragons().rangedWeapons(),
+          faker.electricalComponents().active(),
+          faker.electricalComponents().passive(),
+          faker.electricalComponents().electromechanical(),
+          faker.house().furniture(),
+          faker.house().room(),
+          faker.pokemon().move(),
+          faker.restaurant().nameSuffix(),
+          faker.science().element(),
+          faker.science().quark(),
+          faker.science().leptons(),
+          faker.science().bosons(),
+          faker.science().tool(),
+          faker.team().creature(),
+      };
+//      printer(Arrays.toString(suffixes));
+      String suffix = suffixes[rand.nextInt(suffixes.length)];
+
+      String[] generators = {prefix, name, suffix};
       String generatedString = String.join(" ", Arrays.asList(generators));
       nameOutput.set(generatedString.toLowerCase(Locale.ROOT));