diff --git a/src/main/java/bentobox/addon/challenges/ChallengesManager.java b/src/main/java/bentobox/addon/challenges/ChallengesManager.java
index 2a8a8c6..b0908db 100644
--- a/src/main/java/bentobox/addon/challenges/ChallengesManager.java
+++ b/src/main/java/bentobox/addon/challenges/ChallengesManager.java
@@ -26,18 +26,18 @@ import bentobox.addon.challenges.database.object.Challenges;
 import bentobox.addon.challenges.database.object.Challenges.ChallengeType;
 import bentobox.addon.challenges.database.object.PlayerData;
 import bentobox.addon.challenges.panel.ChallengesPanels;
-import world.bentobox.bentobox.api.configuration.BBConfig;
+import world.bentobox.bentobox.api.configuration.Config;
 import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bentobox.database.BBDatabase;
+import world.bentobox.bentobox.database.Database;
 import world.bentobox.bentobox.util.Util;
 
 public class ChallengesManager {
 
     public static final String FREE = "Free";
     private Map<ChallengeLevels, Set<Challenges>> challengeMap;
-    private BBConfig<Challenges> chConfig;
-    private BBConfig<ChallengeLevels> lvConfig;
-    private BBDatabase<PlayerData> players;
+    private Config<Challenges> chConfig;
+    private Config<ChallengeLevels> lvConfig;
+    private Database<PlayerData> players;
     private ChallengesPanels challengesPanels;
     private Map<UUID,PlayerData> playerData;
     private ChallengesAddon addon;
@@ -45,10 +45,10 @@ public class ChallengesManager {
     public ChallengesManager(ChallengesAddon addon) {
         this.addon = addon;
         // Set up the configs
-        chConfig = new BBConfig<>(addon, Challenges.class);
-        lvConfig = new BBConfig<>(addon, ChallengeLevels.class);
+        chConfig = new Config<>(addon, Challenges.class);
+        lvConfig = new Config<>(addon, ChallengeLevels.class);
         // Players is where all the player history will be stored
-        players = new BBDatabase<>(addon, PlayerData.class);
+        players = new Database<>(addon, PlayerData.class);
         // Cache of challenges
         challengeMap = new LinkedHashMap<>();
         // Cache of player data