diff --git a/campaign/record_card.xml b/campaign/record_card.xml
index 0abb2ad..9b98abe 100644
--- a/campaign/record_card.xml
+++ b/campaign/record_card.xml
@@ -46,18 +46,18 @@
 			local bPeek = false;
 			function onInit()
 				local node = getDatabaseNode();
-				DB.addHandler(DB.getPath(node, CardManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
+				DB.addHandler(DB.getPath(node, CardsManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
 
 				onFacingChanged();
 			end
 
 			function onClose()
 				local node = getDatabaseNode();
-				DB.removeHandler(DB.getPath(node, CardManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
+				DB.removeHandler(DB.getPath(node, CardsManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
 			end
 
 			function onFacingChanged()
-				local bFaceUp = CardManager.isCardFaceUp(getDatabaseNode()) or bPeek;
+				local bFaceUp = CardsManager.isCardFaceUp(getDatabaseNode()) or bPeek;
 				image.setVisible(bFaceUp);
 				image.setEnabled(bFaceUp);
 				back.setVisible(not bFaceUp);
diff --git a/campaign/record_char.xml b/campaign/record_char.xml
index 37dee47..d3c7b1a 100644
--- a/campaign/record_char.xml
+++ b/campaign/record_char.xml
@@ -3,7 +3,7 @@
 	<windowclass name="charsheet" merge="join">
 		<script>
 			function onDrop(x, y, draginfo)
-				local bHandled = CardManager.onDropCard(draginfo, getDatabaseNode());
+				local bHandled = CardsManager.onDropCard(draginfo, getDatabaseNode());
 				
 				if not bHandled then
 					if super and super.onDrop then
diff --git a/common/deck_templates.xml b/common/deck_templates.xml
index 3c8b545..a13079b 100644
--- a/common/deck_templates.xml
+++ b/common/deck_templates.xml
@@ -71,7 +71,7 @@
 					if DB.getValue(vCard, "deckid", "") == "" then
 						return;
 					end
-					setPrototype(CardManager.getCardBack(vCard));
+					setPrototype(CardsManager.getCardBack(vCard));
 				end
 			</script>
 			<anchored>
diff --git a/common/scripts/discardOnCardDrop.lua b/common/scripts/discardOnCardDrop.lua
index 9883539..a17d309 100644
--- a/common/scripts/discardOnCardDrop.lua
+++ b/common/scripts/discardOnCardDrop.lua
@@ -16,10 +16,10 @@ function onDropCardOnDelete(vCard)
 	-- Either we're the host and the card is in the gm hand
 	-- Or we're a client and whose identity matches the card source
 	if Session.IsHost then
-		CardManager.discardCard(vCard, DeckedOutUtilities.getFacedownHotkey(), "gm", {});
+		CardsManager.discardCard(vCard, DeckedOutUtilities.getFacedownHotkey(), "gm", {});
 		return true;
-	elseif sIdentity == CardManager.getCardSource(vCard) then
-		CardManager.discardCard(vCard, DeckedOutUtilities.getFacedownHotkey(), sIdentity, {});
+	elseif sIdentity == CardsManager.getCardSource(vCard) then
+		CardsManager.discardCard(vCard, DeckedOutUtilities.getFacedownHotkey(), sIdentity, {});
 		return true;
 	end
 end
\ No newline at end of file
diff --git a/common/scripts/onCardDrag.lua b/common/scripts/onCardDrag.lua
index db595a3..00d2006 100644
--- a/common/scripts/onCardDrag.lua
+++ b/common/scripts/onCardDrag.lua
@@ -6,6 +6,6 @@ function onDragStart(button, x, y, draginfo)
 		end
 	end
 
-	CardManager.onDragCard(window.getDatabaseNode(), draginfo);
+	CardsManager.onDragCard(window.getDatabaseNode(), draginfo);
 	return true;
 end
\ No newline at end of file
diff --git a/common/scripts/standardCardRadialOptions.lua b/common/scripts/standardCardRadialOptions.lua
index ff0495e..3e294c9 100644
--- a/common/scripts/standardCardRadialOptions.lua
+++ b/common/scripts/standardCardRadialOptions.lua
@@ -7,10 +7,10 @@ function onInit()
 	
 	registerMenuItem(Interface.getString("card_menu_play_face_up"), "play_faceup", 1);
 	registerMenuItem(Interface.getString("card_menu_play_face_down"), "play_facedown", 5)
-	if not CardManager.isCardInDeck(card) then
+	if not CardsManager.isCardInDeck(card) then
 		registerMenuItem(Interface.getString("card_menu_reshuffle"), "reshuffle_card", 6)
 	end
-	if not CardManager.isCardDiscarded(card) then
+	if not CardsManager.isCardDiscarded(card) then
 		registerMenuItem(Interface.getString("card_menu_discard_card"), "discard_card", 7);
 	end
 
@@ -35,12 +35,12 @@ function onCardFlipped()
 	end
 
 	local vCard = window.getDatabaseNode();
-	if not CardManager.isCardInHand(vCard) then
+	if not CardsManager.isCardInHand(vCard) then
 		return;
 	end
 
 	local text;
-	if CardManager.isCardFaceUp(vCard) then	
+	if CardsManager.isCardFaceUp(vCard) then	
 		text = Interface.getString("card_menu_flip_facedown");
 	else
 		text = Interface.getString("card_menu_flip_faceup");
@@ -57,14 +57,14 @@ function onMenuSelection(selection)
 	elseif selection == 2 then
 		DesktopManager.peekCard(window.getDatabaseNode());
 	elseif selection == 3 then
-		CardManager.flipCardFacing(window.getDatabaseNode(), {})
+		CardsManager.flipCardFacing(window.getDatabaseNode(), {})
 	elseif selection == 5 then
 		playCard(true);
 	elseif selection == 6 then
-		CardManager.putCardBackInDeck(window.getDatabaseNode(), DeckedOutUtilities.getFacedownHotkey(), {});
+		CardsManager.putCardBackInDeck(window.getDatabaseNode(), DeckedOutUtilities.getFacedownHotkey(), {});
 	elseif selection == 7 then
 		-- We pass in nil for sIdentity because discardCard gets the user identity for us
-		CardManager.discardCard(window.getDatabaseNode(), DeckedOutUtilities.getFacedownHotkey(), nil, {});
+		CardsManager.discardCard(window.getDatabaseNode(), DeckedOutUtilities.getFacedownHotkey(), nil, {});
 	end
 end
 
@@ -74,8 +74,8 @@ end
 
 function playCard(bFacedown)
 	local vCard = window.getDatabaseNode();
-	local vDeck = CardManager.getDeckNodeFromCard(vCard);
+	local vDeck = CardsManager.getDeckNodeFromCard(vCard);
 
 	local bDiscard = DeckManager.getDeckSetting(vDeck, DeckManager.DECK_SETTING_AUTO_PLAY_FROM_HAND) == "yes"
-	CardManager.playCard(vCard, bFacedown, bDiscard or DeckedOutUtilities.getPlayAndDiscardHotkey(), {});
+	CardsManager.playCard(vCard, bFacedown, bDiscard or DeckedOutUtilities.getPlayAndDiscardHotkey(), {});
 end
\ No newline at end of file
diff --git a/ct/scripts/ct_onCardDrop.lua b/ct/scripts/ct_onCardDrop.lua
index fbb7186..88b114c 100644
--- a/ct/scripts/ct_onCardDrop.lua
+++ b/ct/scripts/ct_onCardDrop.lua
@@ -1,3 +1,3 @@
 function onDrop(x, y, draginfo)
-	return CardManager.onDropCard(draginfo, getDatabaseNode());
+	return CardsManager.onDropCard(draginfo, getDatabaseNode());
 end
\ No newline at end of file
diff --git a/deckbox/deckbox.xml b/deckbox/deckbox.xml
index fd7710e..60b5384 100644
--- a/deckbox/deckbox.xml
+++ b/deckbox/deckbox.xml
@@ -99,7 +99,7 @@
 			<leftClickOpensCardList name="button_view_deck">
 				<script>
 					function onDrop(x, y, draginfo)
-						CardManager.onDropCard(draginfo, window.getDatabaseNode(), DeckManager.DECK_CARDS_PATH);
+						CardsManager.onDropCard(draginfo, window.getDatabaseNode(), DeckManager.DECK_CARDS_PATH);
 					end
 				</script>
 				<anchored to="back" height="36" width="36">
@@ -248,7 +248,7 @@
 					function onButtonPress()
 						local node = window.getDatabaseNode();
 						for sIdentity in pairs(DB.getChildren("charsheet")) do
-							CardManager.discardCardsInHandFromDeck(node, sIdentity, {});
+							CardsManager.discardCardsInHandFromDeck(node, sIdentity, {});
 						end
 					end
 				</script>
@@ -260,9 +260,9 @@
 					function onButtonPress()
 						local node = window.getDatabaseNode();
 						for sIdentity in pairs(DB.getChildren("charsheet")) do
-							CardManager.discardCardsInHandFromDeck(node, sIdentity, {});
+							CardsManager.discardCardsInHandFromDeck(node, sIdentity, {});
 						end
-						CardManager.discardCardsInHandFromDeck(node, "gm", {});
+						CardsManager.discardCardsInHandFromDeck(node, "gm", {});
 					end
 				</script>
 				<state textres="deckbox_button_discard_all_hands" />
diff --git a/deckbox/scripts/character_cardcount.lua b/deckbox/scripts/character_cardcount.lua
index 48f3a54..50c39bc 100644
--- a/deckbox/scripts/character_cardcount.lua
+++ b/deckbox/scripts/character_cardcount.lua
@@ -11,7 +11,7 @@ function onClose()
 end
 
 function getHandPath()
-	return CardManager.getHandPath(window.getDatabaseNode().getName());
+	return CardsManager.getHandPath(window.getDatabaseNode().getName());
 end
 
 function getDeckIdCardPath()
@@ -31,7 +31,7 @@ function getIdentity()
 end
 
 function onHandUpdated()
-	local nCur = CardManager.getNumberOfCardsFromDeckInHand(getDeckNode(), getIdentity())
+	local nCur = CardsManager.getNumberOfCardsFromDeckInHand(getDeckNode(), getIdentity())
 
 	if nCur == 1 then
 		setValue(Interface.getString("deckbox_format_character_cardcount_one"));
diff --git a/deckbox/scripts/deckback.lua b/deckbox/scripts/deckback.lua
index b8f4e55..8173d68 100644
--- a/deckbox/scripts/deckback.lua
+++ b/deckbox/scripts/deckback.lua
@@ -40,13 +40,13 @@ end
 function onDragStart(button, x, y, draginfo)
 	local node = window.getDatabaseNode();
 	if Session.IsHost then
-		CardManager.onDragFromDeck(window.getDatabaseNode(), draginfo);
+		CardsManager.onDragFromDeck(window.getDatabaseNode(), draginfo);
 		return true;
 	end
 end
 
 function onDrop(x, y, draginfo)
-	CardManager.onDropCard(draginfo, window.getDatabaseNode(), DeckManager.DECK_CARDS_PATH);
+	CardsManager.onDropCard(draginfo, window.getDatabaseNode(), DeckManager.DECK_CARDS_PATH);
 end
 
 function onDoubleClick(x, y)
@@ -58,7 +58,7 @@ function playCard(bFacedown)
 	local bDiscard = DeckManager.getDeckSetting(vDeck, DeckManager.DECK_SETTING_AUTO_PLAY_FROM_DECK) == "yes"
 	local aCards = DeckManager.getRandomCardsInDeck(vDeck, 1);
 	if aCards and aCards[1] then
-		CardManager.playCard(aCards[1], bFacedown, bDiscard or DeckedOutUtilities.getPlayAndDiscardHotkey(), {});
+		CardsManager.playCard(aCards[1], bFacedown, bDiscard or DeckedOutUtilities.getPlayAndDiscardHotkey(), {});
 	end
 end
 
diff --git a/deckbox/scripts/portrait_deckbox.lua b/deckbox/scripts/portrait_deckbox.lua
index 6928a49..e385bdb 100644
--- a/deckbox/scripts/portrait_deckbox.lua
+++ b/deckbox/scripts/portrait_deckbox.lua
@@ -19,13 +19,13 @@ function onMenuSelection(selection)
 	elseif selection == 4 then
 		DesktopManager.promptCardAmount(onCardAmountSelected)
 	elseif selection == 7 then
-		CardManager.discardCardsInHandFromDeck(getDeckNode(), getIdentity(), {});
+		CardsManager.discardCardsInHandFromDeck(getDeckNode(), getIdentity(), {});
 	elseif selection == 8 then
-		CardManager.discardRandomCardFromDeck(getDeckNode(), getIdentity(), DeckedOutUtilities.getFacedownHotkey(), {})
+		CardsManager.discardRandomCardFromDeck(getDeckNode(), getIdentity(), DeckedOutUtilities.getFacedownHotkey(), {})
 	elseif selection == 6 then
-		CardManager.putCardsFromDeckInHandBackIntoDeck(getDeckNode(), getIdentity());
+		CardsManager.putCardsFromDeckInHandBackIntoDeck(getDeckNode(), getIdentity());
 	elseif selection == 2 then
-		DesktopManager.openCardList(CardManager.getHandNode(getIdentity()));
+		DesktopManager.openCardList(CardsManager.getHandNode(getIdentity()));
 	end
 end
 
@@ -67,5 +67,5 @@ function onDragStart(button, x, y, draginfo)
 end
 
 function onDrop(x, y, draginfo)
-	CardManager.onDropCard(draginfo, window.getDatabaseNode());
+	CardsManager.onDropCard(draginfo, window.getDatabaseNode());
 end
\ No newline at end of file
diff --git a/desktop/scripts/desktop_card.lua b/desktop/scripts/desktop_card.lua
index dd81bf1..7828960 100644
--- a/desktop/scripts/desktop_card.lua
+++ b/desktop/scripts/desktop_card.lua
@@ -4,18 +4,18 @@ function onInit()
 	-- highlight.setEnabled(false);
 
 	local node = getDatabaseNode();
-	DB.addHandler(DB.getPath(node, CardManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
+	DB.addHandler(DB.getPath(node, CardsManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
 
 	onFacingChanged();
 end
 
 function onClose()
 	local node = getDatabaseNode();
-	DB.removeHandler(DB.getPath(node, CardManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
+	DB.removeHandler(DB.getPath(node, CardsManager.CARD_FACING_PATH), "onUpdate", onFacingChanged)
 end
 
 function onFacingChanged(nodeUpdated)
-	local bFaceUp = CardManager.isCardFaceUp(getDatabaseNode());
+	local bFaceUp = CardsManager.isCardFaceUp(getDatabaseNode());
 	image.setVisible(bFaceUp);
 	image.setEnabled(bFaceUp);
 	cardback.setVisible(not bFaceUp);
diff --git a/desktop/scripts/desktop_hand.lua b/desktop/scripts/desktop_hand.lua
index 13fd36a..6681253 100644
--- a/desktop/scripts/desktop_hand.lua
+++ b/desktop/scripts/desktop_hand.lua
@@ -5,10 +5,10 @@ function onInit()
 	self.onSizeChanged = onSizeChanged;
 
 	if Session.IsHost then
-		DB.addHandler(CardManager.GM_HAND_PATH, "onChildAdded", onCardAdded);
-		DB.addHandler(CardManager.GM_HAND_PATH, "onChildDeleted", onCardDeleted);
+		DB.addHandler(CardsManager.GM_HAND_PATH, "onChildAdded", onCardAdded);
+		DB.addHandler(CardsManager.GM_HAND_PATH, "onChildDeleted", onCardDeleted);
 
-		updateHand(CardManager.getHandNode("gm"));
+		updateHand(CardsManager.getHandNode("gm"));
 	end
 
 	-- registerMenuItem(Interface.getString("hand_menu_play_random"), "customdice", 4);
@@ -20,8 +20,8 @@ end
 
 function onClose()
 	if Session.IsHost then
-		DB.removeHandler(CardManager.GM_HAND_PATH, "onChildAdded", onCardAdded);
-		DB.removeHandler(CardManager.GM_HAND_PATH, "onChildDeleted", onCardDeleted);
+		DB.removeHandler(CardsManager.GM_HAND_PATH, "onChildAdded", onCardAdded);
+		DB.removeHandler(CardsManager.GM_HAND_PATH, "onChildDeleted", onCardDeleted);
 	else
 		clearPlayerCardHandler(User.getCurrentIdentity());
 	end
@@ -31,13 +31,13 @@ function onMenuSelection(selection, subselection)
 	if selection == 8 and subselection == 7 then
 		local sIdentity = self.getIdentity()
 		if sIdentity then
-			CardManager.discardRandomCard(sIdentity, DeckedOutUtilities.getFacedownHotkey(), {})
+			CardsManager.discardRandomCard(sIdentity, DeckedOutUtilities.getFacedownHotkey(), {})
 		end
 	elseif selection == 8 and subselection == 8 then
 		local sIdentity = self.getIdentity()
 		if sIdentity then
 			-- Pass in empty list for tEventTrace since this is guaranteed to be the first place we have an event chain
-			CardManager.discardHand(sIdentity, {});
+			CardsManager.discardHand(sIdentity, {});
 		end
 	end
 end
@@ -53,7 +53,7 @@ function onIdentityStateChange(sIdentity, sUsername, sStateName, vState)
 	if sStateName == "current" then
 		if vState then
 			addPlayerCardHandler(sIdentity);
-			updateHand(CardManager.getHandNode(sIdentity))
+			updateHand(CardsManager.getHandNode(sIdentity))
 
 			-- If we just activated a character and that character
 			-- has cards in their hand, auto-open up the hand window
@@ -74,7 +74,7 @@ function onDrop(x, y, draginfo)
 
 	-- Maybe players should be able to do this? An option toggle the
 	if frame.isVisible() then
-		CardManager.onDropCard(draginfo, hand.getDatabaseNode());
+		CardsManager.onDropCard(draginfo, hand.getDatabaseNode());
 	end
 end
 
@@ -103,16 +103,16 @@ end
 
 function addPlayerCardHandler(sIdentity)
 	if not sCurrentIdentity then
-		DB.addHandler(CardManager.getHandPath(sIdentity), "onChildAdded", onCardAdded);
-		DB.addHandler(CardManager.getHandPath(sIdentity), "onChildDeleted", onCardDeleted);
+		DB.addHandler(CardsManager.getHandPath(sIdentity), "onChildAdded", onCardAdded);
+		DB.addHandler(CardsManager.getHandPath(sIdentity), "onChildDeleted", onCardDeleted);
 		sCurrentIdentity = sIdentity;
 	end
 end
 
 function clearPlayerCardHandler(sIdentity)
 	if sCurrentIdentity then
-		DB.removeHandler(CardManager.getHandPath(sIdentity), "onChildAdded", onCardAdded);
-		DB.removeHandler(CardManager.getHandPath(sIdentity), "onChildDeleted", onCardDeleted);
+		DB.removeHandler(CardsManager.getHandPath(sIdentity), "onChildAdded", onCardAdded);
+		DB.removeHandler(CardsManager.getHandPath(sIdentity), "onChildDeleted", onCardDeleted);
 		sCurrentIdentity = nil;
 	end
 end
diff --git a/extension.xml b/extension.xml
index 18ec671..778cd98 100644
--- a/extension.xml
+++ b/extension.xml
@@ -38,7 +38,7 @@
 		<script name="DeckedOutMessages" file="scripts/decked_out_messages.lua" />
 		<script name="DeckedOutUtilities" file="scripts/decked_out_utilities.lua" />
 		
-		<script name="CardManager" file="scripts/manager_card.lua" />
+		<script name="CardsManager" file="scripts/manager_cards.lua" />
 		<script name="DeckManager" file="scripts/manager_deck.lua" />
 		<script name="CardStorage" file="scripts/manager_storage.lua" />
 		<script name="DesktopManagerDO" file="scripts/manager_desktop_do.lua" />
diff --git a/scripts/decked_out.lua b/scripts/decked_out.lua
index c6f66f9..eb4f704 100644
--- a/scripts/decked_out.lua
+++ b/scripts/decked_out.lua
@@ -27,7 +27,7 @@ function onInit()
 		});
 
 		-- Create the GM hand node if it doesn't exist
-		local node = DB.createNode(CardManager.GM_HAND_PATH);
+		local node = DB.createNode(CardsManager.GM_HAND_PATH);
 		node.setPublic(true);
 	end
 
diff --git a/scripts/decked_out_events.lua b/scripts/decked_out_events.lua
index 246b760..c589a12 100644
--- a/scripts/decked_out_events.lua
+++ b/scripts/decked_out_events.lua
@@ -550,16 +550,16 @@ function deleteCardsFromDecksThatAreDeleted(tEventArgs, tEventTrace)
 	-- the deck is gone. So we use tEventArgs.sDeckNode
 	-- Go through all characters
 	for k,v in pairs(DB.getChildren("charsheet")) do
-		for _, card in pairs(DB.getChildren(v, CardManager.PLAYER_HAND_PATH)) do
-			if CardManager.getDeckIdFromCard(card) == tEventArgs.sDeckNode then
+		for _, card in pairs(DB.getChildren(v, CardsManager.PLAYER_HAND_PATH)) do
+			if CardsManager.getDeckIdFromCard(card) == tEventArgs.sDeckNode then
 				card.delete();
 			end
 		end
 	end
 
 	-- Go through the GM hand
-	for _, card in pairs(DB.getChildren(CardManager.GM_HAND_PATH)) do
-		if CardManager.getDeckIdFromCard(card) == tEventArgs.sDeckNode then
+	for _, card in pairs(DB.getChildren(CardsManager.GM_HAND_PATH)) do
+		if CardsManager.getDeckIdFromCard(card) == tEventArgs.sDeckNode then
 			card.delete();
 		end
 	end
@@ -587,7 +587,7 @@ function onCardDroppedInChat(draginfo)
 
 	-- We specifically don't want to copy cards to storage here, since the message
 	-- handler will will copy it to chat. We only want to raise the event
-	CardManager.playCard(sRecord, DeckedOutUtilities.getFacedownHotkey(), DeckedOutUtilities.shouldPlayAndDiscard(sRecord), tEventTrace)
+	CardsManager.playCard(sRecord, DeckedOutUtilities.getFacedownHotkey(), DeckedOutUtilities.shouldPlayAndDiscard(sRecord), tEventTrace)
 	return true;
 end
 
@@ -601,7 +601,7 @@ function onCardDroppedOnToken(tokenCT, draginfo)
 		return false;
 	end
 
-	return CardManager.onDropCard(draginfo, nodeCT);
+	return CardsManager.onDropCard(draginfo, nodeCT);
 end
 
 ---Event for when a card token is dropped on an image
@@ -618,7 +618,7 @@ function onCardDroppedOnImage(cImageControl, x, y, draginfo)
 	end
 
 	local vCard = DeckedOutUtilities.validateCard(sRecord);
-	local sCardBack = CardManager.getCardBack(vCard);
+	local sCardBack = CardsManager.getCardBack(vCard);
 	
 	-- whether we place a card face down or face up is a bit tricky
 	-- If the card was dragged from its source with the hotkey pressed and is thus face down
@@ -637,7 +637,7 @@ function onCardDroppedOnImage(cImageControl, x, y, draginfo)
 		local token = cImageControl.addToken(sToken, x, y)
 		TokenManager.autoTokenScale(token);
 
-		CardManager.playCard(sRecord, bFacedown, DeckedOutUtilities.shouldPlayAndDiscard(), {})
+		CardsManager.playCard(sRecord, bFacedown, DeckedOutUtilities.shouldPlayAndDiscard(), {})
 
 		return token ~= nil;
 	end
diff --git a/scripts/decked_out_messages.lua b/scripts/decked_out_messages.lua
index ede0edb..a0759fe 100644
--- a/scripts/decked_out_messages.lua
+++ b/scripts/decked_out_messages.lua
@@ -51,7 +51,7 @@ function printCardPlayedMessage(tEventArgs, tEventTrace)
 	end
 
 	local bFacedown = tEventArgs.bFacedown == "true";
-	local sCardSource = CardManager.getCardSource(vCard);
+	local sCardSource = CardsManager.getCardSource(vCard);
 	if sCardSource == "storage" then return end
 
 	-- In this case, everything is public so the two messages can be the same
@@ -90,7 +90,7 @@ function printRandomCardPlayedMessage(tEventArgs, tEventTrace)
 	if not vCard then return end
 
 	local bFacedown = tEventArgs.bFacedown == "true";
-	local sCardSource = CardManager.getCardSource(vCard);
+	local sCardSource = CardsManager.getCardSource(vCard);
 	if sCardSource == "storage" then return end
 
 	-- In this case, everything is public so the two messages can be the same
@@ -263,7 +263,7 @@ function printCardGivenMessage(tEventArgs, tEventTrace)
 	if not vCard then return end
 
 	local bFacedown = tEventArgs.bFacedown == "true";
-	local sCardSource = CardManager.getCardSource(vCard);
+	local sCardSource = CardsManager.getCardSource(vCard);
 	if (not sCardSource) or sCardSource == "storage" then
 		return;
 	end
@@ -297,7 +297,7 @@ function printCardDealtMessage(tEventArgs, tEventTrace)
 	local vCard = DeckedOutUtilities.validateCard(tEventArgs.sCardNode);
 	if not vCard then return end
 
-	local sCardSource = CardManager.getCardSource(vCard);
+	local sCardSource = CardsManager.getCardSource(vCard);
 	if (not sCardSource) or sCardSource == "storage" then
 		return;
 	end
@@ -329,7 +329,7 @@ function printCardDealtFromDiscardMessage(tEventArgs, tEventTrace)
 	local vCard = DeckedOutUtilities.validateCard(tEventArgs.sCardNode);
 	if not vCard then return end
 
-	local sCardSource = CardManager.getCardSource(vCard);
+	local sCardSource = CardsManager.getCardSource(vCard);
 	if (not sCardSource) or sCardSource == "storage" then
 		return;
 	end
@@ -471,7 +471,7 @@ function getUserDisplayNameForCard(vCard)
 	if Session.IsHost then
 		return "The GM";
 	else
-		return ActorManager.getDisplayName(CardManager.getActorHoldingCard(vCard));
+		return ActorManager.getDisplayName(CardsManager.getActorHoldingCard(vCard));
 	end
 end
 
@@ -518,7 +518,7 @@ end
 function resolveCardVisibility(msg, sSenderName, sReceiverName, sMessageId)
 	local sSetting = nil;
 
-	local vDeck = CardManager.getDeckNodeFromCard(msg.card_link);
+	local vDeck = CardsManager.getDeckNodeFromCard(msg.card_link);
 	if not vDeck then return true end -- Would be weird if this happened
 
 	-- We resolve facedown cards first because by default they're never visible
@@ -586,7 +586,7 @@ function formatChatMessage(msgOOB, sMessageId)
 
 	local sCardName = nil;
 	if msgOOB.card_link then
-		sCardName = CardManager.getCardName(msgOOB.card_link);
+		sCardName = CardsManager.getCardName(msgOOB.card_link);
 		bShowCard = resolveCardVisibility(msgOOB, sSenderName, sReceiverName, sMessageId)
 		
 		if not bShowCard then
diff --git a/scripts/decked_out_utilities.lua b/scripts/decked_out_utilities.lua
index 5c31627..b6a6910 100644
--- a/scripts/decked_out_utilities.lua
+++ b/scripts/decked_out_utilities.lua
@@ -40,12 +40,12 @@ function shouldPlayAndDiscard(vCard, vDeck)
 
 	local vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return false end;
-	local vDeck = CardManager.getDeckNodeFromCard(vCard);
+	local vDeck = CardsManager.getDeckNodeFromCard(vCard);
 	if not DeckedOutUtilities.validateDeck(vDeck) then return false end
 
-	if CardManager.isCardInHand(vCard) then
+	if CardsManager.isCardInHand(vCard) then
 		return DeckManager.getDeckSetting(vDeck, DeckManager.DECK_SETTING_AUTO_PLAY_FROM_HAND) == "yes";
-	elseif CardManager.isCardInDeck(vCard) then
+	elseif CardsManager.isCardInDeck(vCard) then
 		return DeckManager.getDeckSetting(vDeck, DeckManager.DECK_SETTING_AUTO_PLAY_FROM_DECK) == "yes";
 	end
 	
@@ -150,7 +150,7 @@ end
 ---@param sIdentity string Identity of the player or gm to validate
 ---@return databasenode
 function validateHandNode(sIdentity)
-	local handNode = CardManager.getHandNode(sIdentity);
+	local handNode = CardsManager.getHandNode(sIdentity);
 	if handNode == nil then
 		Debug.console("ERROR: Could not resolve hand node for user identity" .. sIdentity);
 		printstack();
@@ -175,12 +175,12 @@ end
 ---@param fCallback function
 function addOnCardFlippedHandler(vCard, fCallback)
 	if not validateCard(vCard) then return end;
-	DB.addHandler(DB.getPath(vCard, CardManager.CARD_FACING_PATH), "onUpdate", fCallback);
+	DB.addHandler(DB.getPath(vCard, CardsManager.CARD_FACING_PATH), "onUpdate", fCallback);
 end
 ---Removes an onUpdate handler for the given card.
 ---@param vCard databasenode
 ---@param fCallback function
 function removeOnCardFlippedHandler(vCard, fCallback)
 	if not vCard then return end;
-	DB.removeHandler(DB.getPath(vCard, CardManager.CARD_FACING_PATH), "onUpdate", fCallback);
+	DB.removeHandler(DB.getPath(vCard, CardsManager.CARD_FACING_PATH), "onUpdate", fCallback);
 end
\ No newline at end of file
diff --git a/scripts/manager_card.lua b/scripts/manager_cards.lua
similarity index 81%
rename from scripts/manager_card.lua
rename to scripts/manager_cards.lua
index 2f9eb79..831b6ee 100644
--- a/scripts/manager_card.lua
+++ b/scripts/manager_cards.lua
@@ -7,9 +7,9 @@ OOB_MSGTYPE_DISCARD = "discard"
 OOB_MSGTYPE_PUTCARDBACKINDECK = "putcardbackindeck";
 
 function onInit()
-	OOBManager.registerOOBMsgHandler(CardManager.OOB_MSGTYPE_DROPCARD, handleCardDrop);
-	OOBManager.registerOOBMsgHandler(CardManager.OOB_MSGTYPE_DISCARD, handleDiscard);
-	OOBManager.registerOOBMsgHandler(CardManager.OOB_MSGTYPE_PUTCARDBACKINDECK, handlePutCardBackInDeck);
+	OOBManager.registerOOBMsgHandler(CardsManager.OOB_MSGTYPE_DROPCARD, handleCardDrop);
+	OOBManager.registerOOBMsgHandler(CardsManager.OOB_MSGTYPE_DISCARD, handleDiscard);
+	OOBManager.registerOOBMsgHandler(CardsManager.OOB_MSGTYPE_PUTCARDBACKINDECK, handlePutCardBackInDeck);
 end
 
 ------------------------------------------
@@ -35,8 +35,8 @@ function moveCard(vCard, vDestination, tEventTrace)
 	vCard.delete();
 
 	-- if the card was moved to anywhere other than a hand, delete the facing node
-	if not CardManager.isCardInHand(newNode) then
-		CardManager.deleteFacingNode(newNode);
+	if not CardsManager.isCardInHand(newNode) then
+		CardsManager.deleteFacingNode(newNode);
 	end
 
 	tEventTrace = DeckedOutEvents.raiseOnCardMovedEvent(newNode, sOldCardNode, tEventTrace);
@@ -58,13 +58,13 @@ function addCardToHand(vCard, sIdentity, bFacedown, tEventTrace)
 	if not handNode then return end
 
 	if bFacedown then
-		CardManager.setCardFaceDown(vCard)
+		CardsManager.setCardFaceDown(vCard)
 	else
-		CardManager.setCardFaceUp(vCard);
+		CardsManager.setCardFaceUp(vCard);
 	end
 
 	tEventTrace = DeckedOutEvents.addEventTrace(tEventTrace, DeckedOutEvents.DECKEDOUT_EVENT_CARD_ADDED_TO_HAND);
-	local card = CardManager.moveCard(vCard, handNode, tEventTrace);
+	local card = CardsManager.moveCard(vCard, handNode, tEventTrace);
 
 	DeckedOutEvents.raiseOnCardAddedToHandEvent(card, sIdentity, bFacedown, tEventTrace);
 	
@@ -89,11 +89,11 @@ function discardCard(vCard, bFacedown, sIdentity, tEventTrace)
 		return;
 	end
 
-	local vDeck = DeckedOutUtilities.validateDeck(CardManager.getDeckIdFromCard(vCard));
+	local vDeck = DeckedOutUtilities.validateDeck(CardsManager.getDeckIdFromCard(vCard));
 	if not vDeck then
 		-- If there's no vDeck present, then this could be a case of a dead card
 		-- Check to see if it's other data is empty, and if so, delete it.
-		if (CardManager.getCardFront(vCard) or "") == "" then
+		if (CardsManager.getCardFront(vCard) or "") == "" then
 			vCard.delete();
 			return;
 		end
@@ -110,7 +110,7 @@ function discardCard(vCard, bFacedown, sIdentity, tEventTrace)
 	end
 
 	tEventTrace = DeckedOutEvents.addEventTrace(tEventTrace, DeckedOutEvents.DECKEDOUT_EVENT_CARD_DISCARDED);
-	local card = CardManager.moveCard(vCard, discardNode, tEventTrace);
+	local card = CardsManager.moveCard(vCard, discardNode, tEventTrace);
 	DeckedOutEvents.raiseOnDiscardFromHandEvent(card, sIdentity, bFacedown, tEventTrace);
 end
 
@@ -122,8 +122,8 @@ function discardHand(sIdentity, tEventTrace)
 
 	tEventTrace = DeckedOutEvents.raiseOnHandDiscardedEvent(sIdentity, nil, tEventTrace);
 
-	for k,card in pairs(CardManager.getHandNode(sIdentity).getChildren()) do
-		CardManager.discardCard(card, true, sIdentity, tEventTrace);
+	for k,card in pairs(CardsManager.getHandNode(sIdentity).getChildren()) do
+		CardsManager.discardCard(card, true, sIdentity, tEventTrace);
 	end
 end
 
@@ -140,9 +140,9 @@ function discardCardsInHandFromDeck(vDeck, sIdentity, tEventTrace)
 	tEventTrace = DeckedOutEvents.raiseOnHandDiscardedEvent(sIdentity, vDeck, tEventTrace);
 
 	sDeckId = DeckManager.getDeckId(vDeck);
-	for k,card in pairs(CardManager.getHandNode(sIdentity).getChildren()) do
-		if CardManager.getDeckIdFromCard(card) == sDeckId then
-			CardManager.discardCard(card, false, sIdentity, tEventTrace);
+	for k,card in pairs(CardsManager.getHandNode(sIdentity).getChildren()) do
+		if CardsManager.getDeckIdFromCard(card) == sDeckId then
+			CardsManager.discardCard(card, false, sIdentity, tEventTrace);
 		end
 	end
 end
@@ -157,18 +157,18 @@ function putCardBackInDeck(vCard, bFacedown, tEventTrace)
 
 	-- If we're not the host, then we need to send an OOB
 	if not Session.IsHost then
-		CardManager.sendPutCardBackInDeckMsg(vCard, bFacedown, tEventTrace);
+		CardsManager.sendPutCardBackInDeckMsg(vCard, bFacedown, tEventTrace);
 		return;
 	end
 
-	local vDeck = CardManager.getDeckNodeFromCard(vCard);
+	local vDeck = CardsManager.getDeckNodeFromCard(vCard);
 	if not DeckedOutUtilities.validateDeck(vDeck) then return end
 
-	local sIdentity = CardManager.getCardSource(vCard);
+	local sIdentity = CardsManager.getCardSource(vCard);
 	if not DeckedOutUtilities.validateIdentity(sIdentity) then return end
 
 	tEventTrace = DeckedOutEvents.addEventTrace(tEventTrace, DeckedOutEvents.DECKEDOUT_EVENT_CARD_PUT_BACK_IN_DECK);
-	local card = CardManager.moveCard(vCard, DeckManager.getCardsNode(vDeck), tEventTrace)
+	local card = CardsManager.moveCard(vCard, DeckManager.getCardsNode(vDeck), tEventTrace)
 	if card then
 		tEventTrace = DeckedOutEvents.raiseOnCardReturnedToDeckEvent(card, vDeck, sIdentity, {});
 	end
@@ -184,10 +184,10 @@ function putHandBackIntoDeck(sIdentity, tEventTrace)
 
 	tEventTrace = DeckedOutEvents.raiseOnHandReturnedToDeckEvent(sIdentity, nil, tEventTrace)
 
-	for k,card in pairs(CardManager.getHandNode(sIdentity).getChildren()) do
-		local vDeck = DeckedOutUtilities.validateDeck(CardManager.getDeckIdFromCard(card));
+	for k,card in pairs(CardsManager.getHandNode(sIdentity).getChildren()) do
+		local vDeck = DeckedOutUtilities.validateDeck(CardsManager.getDeckIdFromCard(card));
 		if vDeck then
-			local cardAfterMoved = CardManager.moveCard(card, DeckManager.getCardsNode(vDeck), tEventTrace)
+			local cardAfterMoved = CardsManager.moveCard(card, DeckManager.getCardsNode(vDeck), tEventTrace)
 		end
 	end
 end
@@ -205,11 +205,11 @@ function putCardsFromDeckInHandBackIntoDeck(vDeck, sIdentity, tEventTrace)
 
 	tEventTrace = DeckedOutEvents.raiseOnHandReturnedToDeckEvent(sIdentity, vDeck, tEventTrace)
 
-	for k,card in pairs(CardManager.getHandNode(sIdentity).getChildren()) do
-		local deckid = CardManager.getDeckIdFromCard(card);
+	for k,card in pairs(CardsManager.getHandNode(sIdentity).getChildren()) do
+		local deckid = CardsManager.getDeckIdFromCard(card);
 		local deckNode = DB.findNode(deckid)
 		if deckNode and deckid == sDeckId then
-			CardManager.moveCard(card, DeckManager.getCardsNode(deckNode), tEventTrace)
+			CardsManager.moveCard(card, DeckManager.getCardsNode(deckNode), tEventTrace)
 		end
 	end
 end
@@ -223,18 +223,18 @@ function playCard(vCard, bFacedown, bDiscard, tEventTrace)
 	local vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	local vDeck = DeckedOutUtilities.validateDeck(CardManager.getDeckNodeFromCard(vCard));
+	local vDeck = DeckedOutUtilities.validateDeck(CardsManager.getDeckNodeFromCard(vCard));
 	if not vDeck then return end
 
 	DeckedOutEvents.raiseOnCardPlayedEvent(vCard, bFacedown, bDiscard, tEventTrace)
 
 	if bDiscard then
-		local sIdentity = CardManager.getCardSource(vCard);
-		CardManager.discardCard(vCard, bFacedown, sIdentity, tEventTrace);
+		local sIdentity = CardsManager.getCardSource(vCard);
+		CardsManager.discardCard(vCard, bFacedown, sIdentity, tEventTrace);
 	else
 		-- The most minor of optimizations
 		-- Don't flip the card face up if it's getting discarded
-		CardManager.setCardFaceUp(vCard);
+		CardsManager.setCardFaceUp(vCard);
 	end
 end
 
@@ -246,12 +246,12 @@ end
 function playRandomCard(sIdentity, bFacedown, bDiscard, tEventTrace)
 	if not DeckedOutUtilities.validateIdentity(sIdentity) then return end
 
-	local aCards = CardManager.getRandomCardsInHand(sIdentity, 1);
+	local aCards = CardsManager.getRandomCardsInHand(sIdentity, 1);
 
 	if aCards and aCards[1] then
 		-- tEventTrace = DeckedOutEvents.addEventTrace(tEventTrace, DeckedOutEvents.DECKEDOUT_EVENT_HAND_PLAY_RANDOM);
 		DeckedOutEvents.raiseOnPlayRandomCardEvent(aCards[1], bFacedown, tEventTrace)
-		CardManager.playCard(aCards[1], bFacedown, bDiscard, tEventTrace);
+		CardsManager.playCard(aCards[1], bFacedown, bDiscard, tEventTrace);
 		
 	end
 end
@@ -264,11 +264,11 @@ end
 function discardRandomCard(sIdentity, bFacedown, tEventTrace)
 	if not DeckedOutUtilities.validateIdentity(sIdentity) then return end
 
-	local aCards = CardManager.getRandomCardsInHand(sIdentity, 1);
+	local aCards = CardsManager.getRandomCardsInHand(sIdentity, 1);
 	
 	if aCards and aCards[1] then
 		tEventTrace = DeckedOutEvents.raiseOnDiscardRandomCardEvent(aCards[1], sIdentity, bFacedown, nil, tEventTrace)
-		CardManager.discardCard(aCards[1], bFacedown, sIdentity, tEventTrace);
+		CardsManager.discardCard(aCards[1], bFacedown, sIdentity, tEventTrace);
 	end
 end
 
@@ -280,11 +280,11 @@ end
 function discardRandomCardFromDeck(vDeck, sIdentity, bFacedown, tEventTrace)
 	if not DeckedOutUtilities.validateIdentity(sIdentity) then return end
 
-	local aCards = CardManager.getRandomCardsInHand(sIdentity, 1, vDeck);
+	local aCards = CardsManager.getRandomCardsInHand(sIdentity, 1, vDeck);
 
 	if aCards and aCards[1] then
 		DeckedOutEvents.raiseOnDiscardRandomCardEvent(aCards[1], sIdentity, bFacedown, vDeck, tEventTrace)
-		CardManager.discardCard(aCards[1], bFacedown, sIdentity, tEventTrace);
+		CardsManager.discardCard(aCards[1], bFacedown, sIdentity, tEventTrace);
 	end
 end
 
@@ -294,12 +294,12 @@ function flipCardFacing(vCard, tEventTrace)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	if CardManager.isCardFaceUp(vCard) then
-		DeckedOutEvents.raiseOnCardFlippedEvent(vCard, CardManager.getCardSource(vCard), 0, tEventTrace)
-		CardManager.setCardFaceDown(vCard);
+	if CardsManager.isCardFaceUp(vCard) then
+		DeckedOutEvents.raiseOnCardFlippedEvent(vCard, CardsManager.getCardSource(vCard), 0, tEventTrace)
+		CardsManager.setCardFaceDown(vCard);
 	else
-		DeckedOutEvents.raiseOnCardFlippedEvent(vCard, CardManager.getCardSource(vCard), 1, tEventTrace)
-		CardManager.setCardFaceUp(vCard);
+		DeckedOutEvents.raiseOnCardFlippedEvent(vCard, CardsManager.getCardSource(vCard), 1, tEventTrace)
+		CardsManager.setCardFaceUp(vCard);
 	end
 end
 
@@ -311,7 +311,7 @@ end
 ---@param sIdentity string Character identity (or 'gm')
 ---@return databasenode
 function getHandNode(sIdentity)
-	return DB.createNode(CardManager.getHandPath(sIdentity));
+	return DB.createNode(CardsManager.getHandPath(sIdentity));
 end
 
 ---Returns the full DB path for an identity's hand node
@@ -321,9 +321,9 @@ function getHandPath(sIdentity)
 	if not DeckedOutUtilities.validateIdentity(sIdentity) then return end
 
 	if sIdentity == "gm" then
-		return CardManager.GM_HAND_PATH;
+		return CardsManager.GM_HAND_PATH;
 	else
-		return DB.getPath("charsheet", sIdentity, CardManager.PLAYER_HAND_PATH);
+		return DB.getPath("charsheet", sIdentity, CardsManager.PLAYER_HAND_PATH);
 	end
 end
 
@@ -331,7 +331,7 @@ end
 ---@param sIdentity string Character identity (or 'gm')
 ---@return table cards A table of card database nodes, indexed by the node name
 function getCardsInHand(sIdentity)
-	local handNode = CardManager.getHandNode(sIdentity);
+	local handNode = CardsManager.getHandNode(sIdentity);
 	return DB.getChildren(handNode);
 end
 
@@ -340,7 +340,7 @@ end
 ---@return number
 function getNumberOfCardsInHand(sIdentity)
 	if not DeckedOutUtilities.validateIdentity(sIdentity) then return end
-	return CardManager.getHandNode(sIdentity).getChildCount();
+	return CardsManager.getHandNode(sIdentity).getChildCount();
 end
 
 ---Gets the number of cards in an identity's hand that originate from a specific deck
@@ -354,8 +354,8 @@ function getNumberOfCardsFromDeckInHand(vDeck, sIdentity)
 
 	local nCount = 0;
 	local sDeckId = DeckManager.getDeckId(vDeck);
-	for k,card in pairs(CardManager.getHandNode(sIdentity).getChildren()) do
-		local deckid = CardManager.getDeckIdFromCard(card);
+	for k,card in pairs(CardsManager.getHandNode(sIdentity).getChildren()) do
+		local deckid = CardsManager.getDeckIdFromCard(card);
 		local deckNode = DB.findNode(deckid)
 		if deckNode and deckid == sDeckId then
 			nCount = nCount + 1;
@@ -378,9 +378,9 @@ function getRandomCardsInHand(sIdentity, nNumberOfCards, vDeck)
 	end
 
 	local aCards = {};
-	for k,v in pairs(CardManager.getCardsInHand(sIdentity)) do
+	for k,v in pairs(CardsManager.getCardsInHand(sIdentity)) do
 		if sDeckId then
-			if CardManager.getDeckIdFromCard(v) == sDeckId then
+			if CardsManager.getDeckIdFromCard(v) == sDeckId then
 				table.insert(aCards, v);
 			end
 		else
@@ -410,7 +410,7 @@ end
 ---@param tEventTrace table
 function sendPutCardBackInDeckMsg(vCard, bFacedown, tEventTrace)
 	local msg = {};
-	msg.type = CardManager.OOB_MSGTYPE_PUTCARDBACKINDECK;
+	msg.type = CardsManager.OOB_MSGTYPE_PUTCARDBACKINDECK;
 	msg.sCardRecord = vCard.getNodeName();
 	if bFacedown then
 		msg.bFacedown = "true";
@@ -446,7 +446,7 @@ function handlePutCardBackInDeck(msgOOB)
 		value = msgOOB[key];
 	end
 
-	CardManager.putCardBackInDeck(msgOOB.sCardRecord, msgOOB.bFacedown == "true", tEventTrace);
+	CardsManager.putCardBackInDeck(msgOOB.sCardRecord, msgOOB.bFacedown == "true", tEventTrace);
 end
 
 ------------------------------------------
@@ -460,7 +460,7 @@ end
 ---@param tEventTrace Event trace table
 function sendDiscardMsg(vCard, bFacedown, sIdentity, tEventTrace)
 	local msg = {};
-	msg.type = CardManager.OOB_MSGTYPE_DISCARD;
+	msg.type = CardsManager.OOB_MSGTYPE_DISCARD;
 	msg.sCardRecord = vCard.getNodeName();
 	msg.sSender = sIdentity;
 
@@ -492,7 +492,7 @@ function handleDiscard(msgOOB)
 		value = msgOOB[key];
 	end
 
-	CardManager.discardCard(msgOOB.sCardRecord, msgOOB.bFacedown == "true", msgOOB.sSender, tEventTrace);
+	CardsManager.discardCard(msgOOB.sCardRecord, msgOOB.bFacedown == "true", msgOOB.sSender, tEventTrace);
 end
 
 ------------------------------------------
@@ -528,7 +528,7 @@ function isCardInHand(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	return CardManager.isCardOwnedByCharacter(vCard) or CardManager.isCardOwnedByGm(vCard);
+	return CardsManager.isCardOwnedByCharacter(vCard) or CardsManager.isCardOwnedByGm(vCard);
 end
 
 ---Checks if a card is currently in a character's hand
@@ -546,7 +546,7 @@ end
 function isCardOwnedByGm(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
-	return StringManager.startsWith(vCard.getNodeName(), CardManager.GM_HAND_PATH);
+	return StringManager.startsWith(vCard.getNodeName(), CardsManager.GM_HAND_PATH);
 end
 
 ---Gets the full database path of the deck from which a card originates
@@ -566,7 +566,7 @@ function getDeckNodeFromCard(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	return DeckedOutUtilities.validateDeck(CardManager.getDeckIdFromCard(vCard));
+	return DeckedOutUtilities.validateDeck(CardsManager.getDeckIdFromCard(vCard));
 end
 
 ---Gets the name of the deck from which a card originates
@@ -589,8 +589,8 @@ function doesCardComeFromDeck(vDeck, vCard)
 	vDeck = DeckedOutUtilities.validateDeck(vDeck);
 	if not vDeck then return end
 
-	return CardManager.getDeckIdFromCard(vCard) == CardManager.getDeckId(vDeck) and
-		   CardManager.getDeckNameFromCard(vCard) == CardManager.getDeckName(vDeck);
+	return CardsManager.getDeckIdFromCard(vCard) == CardsManager.getDeckId(vDeck) and
+		   CardsManager.getDeckNameFromCard(vCard) == CardsManager.getDeckName(vDeck);
 end
 
 ---Gets the token prototype for the back of a card's deck
@@ -600,7 +600,7 @@ function getCardBack(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	return DeckManager.getDecksCardBack(CardManager.getDeckIdFromCard(vCard));
+	return DeckManager.getDecksCardBack(CardsManager.getDeckIdFromCard(vCard));
 end
 
 ---Gets the token prototype for a card
@@ -636,7 +636,7 @@ function getCardSource(vCard)
 		return "storage";
 	end
 
-	if CardManager.isCardInHand(vCard) then
+	if CardsManager.isCardInHand(vCard) then
 		if StringManager.startsWith(vCard.getNodeName(), "charsheet") then
 			return vCard.getChild("...").getName();
 		end
@@ -652,7 +652,7 @@ function getActorHoldingCard(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	if not CardManager.isCardOwnedByCharacter(vCard) then
+	if not CardsManager.isCardOwnedByCharacter(vCard) then
 		return;
 	end
 
@@ -669,7 +669,7 @@ function isActorHoldingCard(vCard, rActor)
 	if not DeckedOutUtilities.validateParameter(rActor, "rActor") then return false end
 
 	-- Check if the source is the GM or storage
-	local sSource = CardManager.getCardSource(vCard)
+	local sSource = CardsManager.getCardSource(vCard)
 	if sSource == "gm" or sSource == "storage" then
 		return false;
 	end
@@ -685,11 +685,11 @@ function isCardFaceUp(vCard)
 	if not vCard then return false end
 
 	-- cards can only be facedown in hand. If the card isn't in a hand, then it's always face up
-	if not CardManager.isCardInHand(vCard) then
+	if not CardsManager.isCardInHand(vCard) then
 		return true;
 	end
 
-	return CardManager.getCardFacing(vCard) == 1;
+	return CardsManager.getCardFacing(vCard) == 1;
 end
 
 ---Is Card Face up
@@ -700,11 +700,11 @@ function isCardFaceDown(vCard)
 	if not vCard then return false end
 
 	-- cards can only be facedown in hand. If the card isn't in a hand, then it's always face up
-	if not CardManager.isCardInHand(vCard) then
+	if not CardsManager.isCardInHand(vCard) then
 		return false;
 	end
 
-	return CardManager.getCardFacing(vCard) == 0;
+	return CardsManager.getCardFacing(vCard) == 0;
 end
 
 ---Gets the card facing number. 1 = face up, 0 = face down
@@ -715,11 +715,11 @@ function getCardFacing(vCard)
 	if not vCard then return 0 end
 
 	-- cards can only be facedown in hand. If the card isn't in a hand, then it's always face up
-	if not CardManager.isCardInHand(vCard) then
+	if not CardsManager.isCardInHand(vCard) then
 		return 1;
 	end
 
-	return DB.getValue(vCard, CardManager.CARD_FACING_PATH, 1);
+	return DB.getValue(vCard, CardsManager.CARD_FACING_PATH, 1);
 end
 
 ---Sets a card face up if it's in a hand
@@ -728,7 +728,7 @@ function setCardFaceUp(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	CardManager.setCardFacing(vCard, 1);
+	CardsManager.setCardFacing(vCard, 1);
 end
 
 ---Sets a card face down if it's in a hand
@@ -737,7 +737,7 @@ function setCardFaceDown(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	CardManager.setCardFacing(vCard, 0);
+	CardsManager.setCardFacing(vCard, 0);
 end
 
 ---Sets a card face up for face down
@@ -748,7 +748,7 @@ function setCardFacing(vCard, nFacing)
 	if not vCard then return end
 
 	-- if the card is in a hand, we can set the facing
-	DB.setValue(vCard, CardManager.CARD_FACING_PATH, "number", nFacing)
+	DB.setValue(vCard, CardsManager.CARD_FACING_PATH, "number", nFacing)
 end
 
 ---Deletes the facup node for a card
@@ -757,7 +757,7 @@ function deleteFacingNode(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	DB.deleteChild(vCard, CardManager.CARD_FACING_PATH);
+	DB.deleteChild(vCard, CardsManager.CARD_FACING_PATH);
 end
 ------------------------------------------
 -- DRAG DROP
@@ -773,7 +773,7 @@ function onDragFromDeck(vDeck, draginfo)
 	local vCard = DeckedOutUtilities.validateCard(DeckManager.drawCard(vDeck));
 	if not vCard then return end
 
-	CardManager.onDragCard(vCard, draginfo);
+	CardsManager.onDragCard(vCard, draginfo);
 
 	local bFacedown = DeckManager.dealFacedownByDefault(vDeck) 
 					  or DeckedOutUtilities.getFacedownHotkey();
@@ -789,7 +789,7 @@ function onDragFromDeck(vDeck, draginfo)
 
 	-- Check if the GM should see the card being dealt (which is separate from the card being dealt face down)
 	if sDealVisSetting == "actor" or sDealVisSetting == "none" or (bFacedown and not bGmSeesFacedown) then
-		draginfo.setTokenData(CardManager.getCardBack(vCard));
+		draginfo.setTokenData(CardsManager.getCardBack(vCard));
 	else
 		draginfo.setTokenData(DB.getValue(vCard, "image", ""));
 	end
@@ -804,14 +804,14 @@ function onDragCard(vCard, draginfo)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	if (CardManager.getCardFront(vCard) or "") == "" then
+	if (CardsManager.getCardFront(vCard) or "") == "" then
 		return true;
 	end
 
 	local bFacedown = DeckedOutUtilities.getFacedownHotkey();
 
 	-- This determines whether the GM should see the card being dragged
-	local bShowCardBack = bFacedown or CardManager.isCardFaceDown(vCard);
+	local bShowCardBack = bFacedown or CardsManager.isCardFaceDown(vCard);
 
 	draginfo.setType("shortcut");
 	draginfo.setShortcutData("card", vCard.getPath());
@@ -819,7 +819,7 @@ function onDragCard(vCard, draginfo)
 	-- The number data is used to determine whether cards should be dealt facedown
 	-- which can be independent of the token that's displayed
 	if bShowCardBack then
-		draginfo.setTokenData(CardManager.getCardBack(vCard));
+		draginfo.setTokenData(CardsManager.getCardBack(vCard));
 		draginfo.setNumberData(0);
 	else
 		draginfo.setTokenData(DB.getValue(vCard, "image", ""));
@@ -838,7 +838,7 @@ end
 ---@return boolean
 function onDropCard(draginfo, vDestination, sExtra)
 	if not draginfo then
-		Debug.console("ERROR: CardManager.onDropCard(): draginfo was nil or not found.");
+		Debug.console("ERROR: CardsManager.onDropCard(): draginfo was nil or not found.");
 		return false;
 	end
 	local vDestination = DeckedOutUtilities.validateNode(vDestination, "vDestination");
@@ -868,7 +868,7 @@ function onDropCard(draginfo, vDestination, sExtra)
 		-- to grab cards from chat. GMs can always do this, and they're allowed
 		-- to grab from anywhere, not just discards
 		local bAllowPlayerGrab = DeckManager.getDeckSetting(
-			CardManager.getDeckNodeFromCard(sRecord), 
+			CardsManager.getDeckNodeFromCard(sRecord), 
 			DeckManager.DECK_SETTING_PLAYERS_CAN_GRAB_DISCARDS) == "yes";
 
 		-- Do all the negative checks first for ease of readability.
@@ -896,11 +896,11 @@ function onDropCard(draginfo, vDestination, sExtra)
 	sDestPath = vDestination.getNodeName();
 
 	if not Session.IsHost then
-		CardManager.sendCardDropMessage(sRecord, sDestPath, sExtra, bFacedown);
+		CardsManager.sendCardDropMessage(sRecord, sDestPath, sExtra, bFacedown);
 		return true;
 	end
 
-	return CardManager.handleAnyDrop(sRecord, sDestPath, sExtra, bFacedown);
+	return CardsManager.handleAnyDrop(sRecord, sDestPath, sExtra, bFacedown);
 end
 
 ---Handles dropping a card on any target
@@ -919,32 +919,32 @@ function handleAnyDrop(sSourceNode, sDestinationNode, sExtra, bFacedown)
 	-- Dropped on a charater sheet
 	if StringManager.startsWith(vDestination.getNodeName(), "charsheet") then
 		-- If vDestination isn't the hand path, then get the hand path
-		if vDestination.getName() ~= CardManager.PLAYER_HAND_PATH then
-			vDestination = CardManager.getHandNode(vDestination.getName());
+		if vDestination.getName() ~= CardsManager.PLAYER_HAND_PATH then
+			vDestination = CardsManager.getHandNode(vDestination.getName());
 		end
 		
 		-- After the above, vDestination is the cards node for the character (charsheet.*.cards)
 		sReceivingIdentity = vDestination.getParent().getName();
 
-	elseif StringManager.startsWith(vDestination.getNodeName(), CardManager.GM_HAND_PATH) then
-		vDestination = CardManager.getHandNode("gm");
+	elseif StringManager.startsWith(vDestination.getNodeName(), CardsManager.GM_HAND_PATH) then
+		vDestination = CardsManager.getHandNode("gm");
 		sReceivingIdentity = "gm"
 
 	elseif StringManager.startsWith(vDestination.getNodeName(), "combattracker") then
 		if ActorManager.isPC(vDestination) then
 			-- If dropping on PC, give card to that PC
 			sReceivingIdentity = ActorManager.getCreatureNode(vDestination).getName();
-			vDestination = CardManager.getHandNode(sReceivingIdentity);
+			vDestination = CardsManager.getHandNode(sReceivingIdentity);
 		else
 			-- If dropping on NPC, give card to GM
-			vDestination = CardManager.getHandNode("gm");
+			vDestination = CardsManager.getHandNode("gm");
 			sReceivingIdentity = "gm"
 		end
 
 	elseif StringManager.startsWith(vDestination.getNodeName(), "deckbox") then
 		-- Check that the card being dropped belongs in this deck
-		if CardManager.getDeckIdFromCard(vCard) ~= DeckManager.getDeckId(vDestination) then
-			Debug.console("WARNING: CardManager.handleAnyDrop(): Tried to move a card to another deck.")
+		if CardsManager.getDeckIdFromCard(vCard) ~= DeckManager.getDeckId(vDestination) then
+			Debug.console("WARNING: CardsManager.handleAnyDrop(): Tried to move a card to another deck.")
 			return false;
 		end
 
@@ -961,7 +961,7 @@ function handleAnyDrop(sSourceNode, sDestinationNode, sExtra, bFacedown)
 	-- and if it is, bail.
 	local sourceParentNode = vCard.getParent();
 	if sourceParentNode.getNodeName() == vDestination.getNodeName() then
-		Debug.console("WARNING: CardManager.handleAnyDrop(): Tried to move a card to the same place it originated from.")
+		Debug.console("WARNING: CardsManager.handleAnyDrop(): Tried to move a card to the same place it originated from.")
 		return true;
 	end
 
@@ -970,29 +970,29 @@ function handleAnyDrop(sSourceNode, sDestinationNode, sExtra, bFacedown)
 
 		if (sReceivingIdentity or "") ~= "" then
 			-- If the card being dropped is currently in a hand, then we fire the give event
-			if CardManager.isCardInHand(vCard) then
-				local sGiverIdentity = CardManager.getCardSource(vCard);
+			if CardsManager.isCardInHand(vCard) then
+				local sGiverIdentity = CardsManager.getCardSource(vCard);
 				tEventTrace = DeckedOutEvents.addEventTrace(tEventTrace, DeckedOutEvents.DECKEDOUT_EVENT_CARD_GIVEN);
-				local card = CardManager.addCardToHand(vCard, sReceivingIdentity, false, tEventTrace);
+				local card = CardsManager.addCardToHand(vCard, sReceivingIdentity, false, tEventTrace);
 				DeckedOutEvents.raiseOnGiveCardEvent(card, sGiverIdentity, sReceivingIdentity, bFacedown, tEventTrace)
 				return true;
 
 			-- If the card being dropped is currently in a deck or discard pile, we fire the deal event
-			elseif CardManager.isCardInDeck(vCard) or CardManager.isCardDiscarded(vCard) then
+			elseif CardsManager.isCardInDeck(vCard) or CardsManager.isCardDiscarded(vCard) then
 				-- Since we're dealing the card from a deck, we need to get the deck's default deal facing
 				local bDefaultFacing = DeckManager.getDeckSetting(
-					CardManager.getDeckNodeFromCard(vCard), 
+					CardsManager.getDeckNodeFromCard(vCard), 
 					DeckManager.DECK_SETTING_DEFAULT_DEAL_FACING)
 				bFacedown = bFacedown or bDefaultFacing == "facedown";
 				
 				-- If we're fishing this card from the discard pile, then we want to raise a different event
-				if CardManager.isCardDiscarded(vCard) then
+				if CardsManager.isCardDiscarded(vCard) then
 					tEventTrace = DeckedOutEvents.addEventTrace(tEventTrace, DeckedOutEvents.DECKEDOUT_EVENT_DEALT_FROM_DISCARD);
-					local card = CardManager.addCardToHand(vCard, sReceivingIdentity, bFacedown, tEventTrace);
+					local card = CardsManager.addCardToHand(vCard, sReceivingIdentity, bFacedown, tEventTrace);
 					DeckedOutEvents.raiseOnCardDealtFromDiscardEvent(card, sReceivingIdentity, bFacedown, tEventTrace)
 				else	
 					tEventTrace = DeckedOutEvents.addEventTrace(tEventTrace, DeckedOutEvents.DECKEDOUT_EVENT_CARD_DEALT);
-					local card = CardManager.addCardToHand(vCard, sReceivingIdentity, bFacedown, tEventTrace);
+					local card = CardsManager.addCardToHand(vCard, sReceivingIdentity, bFacedown, tEventTrace);
 					DeckedOutEvents.raiseOnDealCardEvent(card, sReceivingIdentity, bFacedown, tEventTrace)
 				end
 				return true;
@@ -1001,21 +1001,21 @@ function handleAnyDrop(sSourceNode, sDestinationNode, sExtra, bFacedown)
 			if StringManager.startsWith(vDestination.getNodeName(), "deckbox") then
 				-- We dropped onto the deck, so we fire the return to deck event
 				if vDestination.getName() == DeckManager.DECK_CARDS_PATH then
-					local sGiverIdentity = CardManager.getCardSource(vCard);
+					local sGiverIdentity = CardsManager.getCardSource(vCard);
 					DeckedOutEvents.raiseOnCardReturnedToDeckEvent(
 						vCard, 
-						CardManager.getDeckNodeFromCard(vCard), 
+						CardsManager.getDeckNodeFromCard(vCard), 
 						sGiverIdentity, 
 						bFacedown,
 						tEventTrace);
-					CardManager.moveCard(vCard, vDestination, tEventTrace);
+					CardsManager.moveCard(vCard, vDestination, tEventTrace);
 					return true;
 				elseif vDestination.getName() == DeckManager.DECK_DISCARD_PATH then
-					local sGiverIdentity = CardManager.getCardSource(vCard);
+					local sGiverIdentity = CardsManager.getCardSource(vCard);
 					local card = discardCard(vCard, bFacedown, sGiverIdentity, tEventTrace);
 				end
 			else
-				local card = CardManager.moveCard(vCard, vDestination, tEventTrace);
+				local card = CardsManager.moveCard(vCard, vDestination, tEventTrace);
 				return true;
 			end
 		end
@@ -1035,7 +1035,7 @@ function sendCardDropMessage(sSourceNode, sDestinationNode, sExtra, bFacedown)
 	end
 
 	local msgOOB = {};
-	msgOOB.type = CardManager.OOB_MSGTYPE_DROPCARD;
+	msgOOB.type = CardsManager.OOB_MSGTYPE_DROPCARD;
 	msgOOB.sSourceNode = sSourceNode;
 	msgOOB.sDestinationNode = sDestinationNode;
 	msgOOB.sExtra = sExtra;
@@ -1057,5 +1057,5 @@ function handleCardDrop(msgOOB)
 		return;
 	end
 
-	CardManager.handleAnyDrop(msgOOB.sSourceNode, msgOOB.sDestinationNode, msgOOB.sExtra, msgOOB.bFacedown == "true");
+	CardsManager.handleAnyDrop(msgOOB.sSourceNode, msgOOB.sDestinationNode, msgOOB.sExtra, msgOOB.bFacedown == "true");
 end
\ No newline at end of file
diff --git a/scripts/manager_deck.lua b/scripts/manager_deck.lua
index 801456f..a89b579 100644
--- a/scripts/manager_deck.lua
+++ b/scripts/manager_deck.lua
@@ -7,15 +7,15 @@ function onInit()
 end
 
 function onCharacterDeleted(node)
-	local handnode = node.getChild(CardManager.PLAYER_HAND_PATH);
+	local handnode = node.getChild(CardsManager.PLAYER_HAND_PATH);
 	if not handnode then
 		return
 	end
 
 	for k,card in pairs(handnode.getChildren()) do
-		local deck = CardManager.getDeckNodeFromCard(card);
+		local deck = CardsManager.getDeckNodeFromCard(card);
 		if deck then
-			CardManager.moveCard(card, DeckManager.getDiscardNode(deck), {});
+			CardsManager.moveCard(card, DeckManager.getDiscardNode(deck), {});
 		end
 	end
 end
@@ -46,7 +46,7 @@ function dealCard(vDeck, sIdentity, bFacedown, tEventTrace)
 		-- and sCardNode would be nil by the time a handler got to it otherwise (as it was moved from the deck)
 		-- This makes sure that the trace stack is preserved, while still having the event fire second
 		tEventTrace = DeckedOutEvents.addEventTrace(tEventTrace, DeckedOutEvents.DECKEDOUT_EVENT_CARD_DEALT);
-		local card = CardManager.addCardToHand(aCards[1], sIdentity, bFacedown, tEventTrace);
+		local card = CardsManager.addCardToHand(aCards[1], sIdentity, bFacedown, tEventTrace);
 		DeckedOutEvents.raiseOnDealCardEvent(card, sIdentity, bFacedown, tEventTrace);
 		return card;
 	end
@@ -152,10 +152,10 @@ function addCardToDeck(vCard)
 	vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vDeck then return end
 
-	local vDeck = DeckedOutUtilities.validateDeck(CardManager.getDeckIdFromCard(vCard));
+	local vDeck = DeckedOutUtilities.validateDeck(CardsManager.getDeckIdFromCard(vCard));
 	if not vDeck then return end
 
-	return CardManager.moveCard(vCard, DeckManager.getCardsNode(vDeck));
+	return CardsManager.moveCard(vCard, DeckManager.getCardsNode(vDeck));
 end
 
 ------------------------------------------
@@ -170,7 +170,7 @@ function moveDiscardPileIntoDeck(vDeck)
 
 	local cardsNode = DeckManager.getCardsNode(vDeck);
 	for k,cardNode in pairs(DeckManager.getDiscardNode(vDeck).getChildren()) do
-		CardManager.moveCard(cardNode, cardsNode);
+		CardsManager.moveCard(cardNode, cardsNode);
 	end
 end
 
diff --git a/scripts/manager_desktop_do.lua b/scripts/manager_desktop_do.lua
index 63dc1f3..adcdf4d 100644
--- a/scripts/manager_desktop_do.lua
+++ b/scripts/manager_desktop_do.lua
@@ -22,7 +22,7 @@ end
 
 function onDesktopInit()
 	if Session.IsHost then 
-		DesktopManager.setHandVisibility(CardManager.getNumberOfCardsInHand("gm") > 0);
+		DesktopManager.setHandVisibility(CardsManager.getNumberOfCardsInHand("gm") > 0);
 	end
 end
 
@@ -78,7 +78,7 @@ function onShortcutDropOnPortrait(sIdentity, draginfo)
 	local nodeSource = draginfo.getDatabaseNode();
 
 	if sClass == "card" then
-		CardManager.onDropCard(draginfo, DB.getPath("charsheet", sIdentity));
+		CardsManager.onDropCard(draginfo, DB.getPath("charsheet", sIdentity));
 		return;
 	end
 
@@ -118,6 +118,6 @@ function peekCard(vCard)
 	local w = Interface.openWindow("card", vCard.getNodeName());
 	if w then
 		w.main.subwindow.peek();
-		DeckedOutEvents.raiseOnCardPeekEvent(vCard, CardManager.getCardSource(vCard), {});
+		DeckedOutEvents.raiseOnCardPeekEvent(vCard, CardsManager.getCardSource(vCard), {});
 	end
 end
\ No newline at end of file
diff --git a/scripts/manager_storage.lua b/scripts/manager_storage.lua
index c00fb08..1058e58 100644
--- a/scripts/manager_storage.lua
+++ b/scripts/manager_storage.lua
@@ -34,10 +34,10 @@ function addCardToStorage(vCard, tEventTrace)
 	end
 
 	local newCard = DB.copyNode(vCard, DB.createChild(CardStorage.getCardStorageNode()));
-	local sToken = CardManager.getCardFront(vCard);
+	local sToken = CardsManager.getCardFront(vCard);
 
 	-- We don't want card facing to be stored
-	CardManager.deleteFacingNode(newCard);
+	CardsManager.deleteFacingNode(newCard);
 
 	-- Save the actual location of the card so that we can drag/drop from this entry
 	-- This is a crude way of getting cards back from the discard
@@ -61,7 +61,7 @@ function isCardInStorage(vCard)
 	local vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	local sToken = CardManager.getCardFront(vCard);
+	local sToken = CardsManager.getCardFront(vCard);
 	return _storage[sToken] ~= nil;
 end
 
@@ -72,7 +72,7 @@ function getCardFromStorage(vCard)
 	local vCard = DeckedOutUtilities.validateCard(vCard);
 	if not vCard then return end
 
-	local sToken = CardManager.getCardFront(vCard);
+	local sToken = CardsManager.getCardFront(vCard);
 
 	return _storage[sToken];
 end
diff --git a/todo.txt b/todo.txt
index 84e4b34..3ea6567 100644
--- a/todo.txt
+++ b/todo.txt
@@ -77,7 +77,7 @@ DONE
 	* Disable drag/drop when the hand is hidden
 * When a character recieves a card, auto-open their hand
 * When the gm receives a card, auto-open their hand
-* Separate CardManager into card, deck, and cardstorage managers.
+* Separate CardsManager into card, deck, and cardstorage managers.
 * Add CardStorage, and intercept cards dropped in chat so that links are preserved even as cards move around
 * Drag and drop onto portraits
 * First pass at radial options