diff --git a/lib/capi.jar b/lib/capi.jar
deleted file mode 100644
index 1310588c..00000000
Binary files a/lib/capi.jar and /dev/null differ
diff --git a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java b/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
index 4748f93e..96095d9d 100644
--- a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
+++ b/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
@@ -11,8 +11,8 @@ public class CapiFeatures
 {
 	public static void setup()
 	{
-		Plugin plug = Bukkit.getServer().getPluginManager().getPlugin("CAPI");
-		if (plug != null && plug.getClass().getName().equals("com.massivecraft.capi.CAPI"))
+		Plugin plug = Bukkit.getServer().getPluginManager().getPlugin("capi");
+		if (plug != null && plug.getClass().getName().equals("com.massivecraft.capi.capi"))
 		{
 			P.p.log("Integration with the CAPI plugin was successful");
 			P.p.registerEvent(Event.Type.CUSTOM_EVENT, new PluginCapiListener(P.p), Priority.Normal);
diff --git a/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java b/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
index a447c61b..d8c5f587 100644
--- a/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
+++ b/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
@@ -53,7 +53,7 @@ public class PluginCapiListener extends CapiListener
 	@Override
 	public void onListChannelsEvent(CAPIListChannelsEvent event)
 	{
-		for (Channel c : Channels.i.get())
+		for (Channel c : Channels.i.getAll())
 		{
 			if (myChannelIds.contains(c.getId()))
 			{