diff --git a/src/resources/datatables/STF.java b/src/resources/datatables/STF.java
index 9c0983c8..411b929a 100644
--- a/src/resources/datatables/STF.java
+++ b/src/resources/datatables/STF.java
@@ -19,7 +19,7 @@ public class STF
 			StfTable stf = new StfTable("clientdata/string/en/" + stfFile + ".stf");
 			for (int s = 1; s < stf.getRowCount(); s++) 
 			{		
-				if(stf.getStringById(s).getKey().equals(stfKey)) return stf.getStringById(s).getValue();
+				if(stf.getStringById(s).getKey() != null && stf.getStringById(s).getKey().equals(stfKey)) return stf.getStringById(s).getValue();
 			}
         } 
 		catch (Exception e) { }
diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index 7a12d993..340aea17 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -43,6 +43,7 @@ import protocol.swg.objectControllerObjects.ShowFlyText;
 import resources.common.OutOfBand;
 import resources.datatables.Options;
 import resources.datatables.PvpStatus;
+import resources.datatables.STF;
 import resources.loot.LootGroup;
 import resources.objects.ObjectMessageBuilder;
 import resources.objects.creature.CreatureObject;
@@ -535,24 +536,13 @@ public class TangibleObject extends SWGObject implements Serializable {
 	// Returns the current, true name of the Object
 	public String getTrueName()
 	{
-		return getCustomName() != null ? getCustomName() : getTrueStfName();
+		return (getCustomName() != null && getCustomName().length() > 0) ? getCustomName() : getTrueStfName();
 	}
 		
 	// Returns the true STF-based name
 	public String getTrueStfName()
 	{
-		String name = null;
-		try
-		{
-			StfTable stf = new StfTable("clientdata/string/en/" + getStfFilename() + ".stf");
-			for (int s = 1; s < stf.getRowCount(); s++) 
-			{		
-				if(stf.getStringById(s).getKey().equals(getStfName())) name = stf.getStringById(s).getValue();
-			}
-        } 
-		catch (Exception e) { }
-		
-		return name;	
+		return STF.get(getProperName());
 	}
 	
 	public List<LootGroup> getLootGroups() {
diff --git a/src/services/collections/CollectionService.java b/src/services/collections/CollectionService.java
index a936a1d9..dc339b70 100644
--- a/src/services/collections/CollectionService.java
+++ b/src/services/collections/CollectionService.java
@@ -311,16 +311,16 @@ public class CollectionService implements INetworkDispatch {
 							}
 							
 							if (hidden && !(getCollection(creature, collectionName) > 0)) {
-								creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_hidden_slot_added", "TO", STF.get("@collection_n:" + collectionName)), DisplayType.Broadcast);
+								creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_hidden_slot_added", "TO", STF.get("@collection_n:" + collectionName).replace(":", " -")), DisplayType.Broadcast);
 							}
 							
 							player.setCollections(collections.toByteArray());
 							
 							if (!noMessage) {
 								if (!bookName.equals("crafting_book")) {
-									creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_slot_added", "TU", STF.get("@collection_n:" + slotName), "TO", STF.get("@collection_n:" + collectionName)), DisplayType.Broadcast);
+									creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_slot_added", "TU", STF.get("@collection_n:" + slotName).replace(":", " -"), "TO", STF.get("@collection_n:" + collectionName).replace(":", " -")), DisplayType.Broadcast);
 								} else {
-									creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_slot_increment", "TU", STF.get("@collection_n:" + slotName), "TO", STF.get("@collection_n:" + collectionName)), DisplayType.Broadcast);
+									creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_slot_increment", "TU", STF.get("@collection_n:" + slotName).replace(":", " -"), "TO", STF.get("@collection_n:" + collectionName).replace(":", " -")), DisplayType.Broadcast);
 								}
 							}
 							
@@ -357,7 +357,7 @@ public class CollectionService implements INetworkDispatch {
 							}
 							
 							if (isComplete(creature, collectionName)) {
-								creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_collection_complete", "TO", STF.get("@collection_n:" + collectionName)), DisplayType.Broadcast);
+								creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_collection_complete", "TO", STF.get("@collection_n:" + collectionName).replace(":", " -")), DisplayType.Broadcast);
 								
 								if (!noReward) {
 									try {
@@ -446,7 +446,7 @@ public class CollectionService implements INetworkDispatch {
 								if (trackServerFirst) {
 									if (core.guildService.getGuildObject().addServerFirst(collectionName, new ServerFirst(creature.getCustomName(), creature.getObjectId(), collectionName, System.currentTimeMillis()))) {
 										addCollection(creature, "bdg_server_first_01");
-										creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_server_first", "TT", core.getGalaxyName(), "TO", STF.get("@collection_n:" + collectionName)), DisplayType.Broadcast);
+										creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_server_first", "TT", core.getGalaxyName(), "TO", STF.get("@collection_n:" + collectionName).replace(":", " -")), DisplayType.Broadcast);
 									}
 								}
 								
@@ -819,7 +819,7 @@ public class CollectionService implements INetworkDispatch {
 								}
 								
 								if (collection.equals(collectionName)) {
-									creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_collection_reset", "TO", STF.get("@collection_n:" + collectionName)), DisplayType.Broadcast);
+									creature.sendSystemMessage(OutOfBand.ProsePackage("@collection:player_collection_reset", "TO", STF.get("@collection_n:" + collectionName).replace(":", " -")), DisplayType.Broadcast);
 								}
 								
 								continue;