diff --git a/src/main/java/com/comandante/creeper/ConfigureNpc.java b/src/main/java/com/comandante/creeper/ConfigureNpc.java
index 89c3cf9b124147f7410194be80967ef09e97ed87..7d1b43fa9a3b6894209418cbf12cc8aaababd90a 100755
--- a/src/main/java/com/comandante/creeper/ConfigureNpc.java
+++ b/src/main/java/com/comandante/creeper/ConfigureNpc.java
@@ -131,7 +131,7 @@ public class ConfigureNpc {
         blackbeardItems.put(5, new MerchantItemForSale(ItemType.SMELTING_CRUCIBLE, 8000000));
         blackbeardItems.put(6, new MerchantItemForSale(ItemType.LEATHER_SHOES, 8000000));
         
-        Rogueshop rogueshop = new Rogueshop(gameManager, new Loot(18, 26, Sets.<ItemType>newHashSet()), blackbeardItems);
+        BlackbeardRogue rogueshop = new BlackbeardRogue(gameManager, new Loot(18, 26, Sets.<ItemType>newHashSet()), blackbeardItems);
         gameManager.getRoomManager().addMerchant(864, rogueshop);
         
         Blacksmith blacksmith = new Blacksmith(gameManager, new Loot(18, 26, Sets.<ItemType>newHashSet()), blacksmithItems);
diff --git a/src/main/java/com/comandante/creeper/merchant/BlackbeardRogue.java b/src/main/java/com/comandante/creeper/merchant/BlackbeardRogue.java
index b8f7c813926fdb8e097944773342a86873423e51..d77b28a38441b457f9090ff02289fa21a3c38f5b 100644
--- a/src/main/java/com/comandante/creeper/merchant/BlackbeardRogue.java
+++ b/src/main/java/com/comandante/creeper/merchant/BlackbeardRogue.java
@@ -11,7 +11,7 @@ import java.util.Set;
 
 import static com.comandante.creeper.server.Color.BOLD_ON;
 
-public class Rogueshop extends Merchant {
+public class BlackbeardRogue extends Merchant {
     private final static long phraseIntervalMs = 300000;
     private final static String NAME = "blackbeard";
     private final static String welcomeMessage = "Welcome to Blackbeard's Rogue Shop.\r\n";
@@ -21,7 +21,7 @@ public class Rogueshop extends Merchant {
 
     private final static String colorName = BOLD_ON + Color.CYAN + NAME  + Color.RESET ;
 
-    public Rogueshop(GameManager gameManager, Loot loot, Map<Integer, MerchantItemForSale> merchantItemForSales) {
+    public BlackbeardRogue(GameManager gameManager, Loot loot, Map<Integer, MerchantItemForSale> merchantItemForSales) {
         super(gameManager, NAME, colorName, validTriggers, merchantItemForSales, welcomeMessage);
     }
 }