diff --git a/src/resources/commands/callbacks/FindFriendCallback.java b/src/resources/commands/callbacks/FindFriendCallback.java
index 7edace4ca..711e582bd 100644
--- a/src/resources/commands/callbacks/FindFriendCallback.java
+++ b/src/resources/commands/callbacks/FindFriendCallback.java
@@ -79,7 +79,7 @@ public class FindFriendCallback implements ICmdCallback {
 		WaypointObject waypoint = null;
 		for (Map.Entry<Long, WaypointObject> entry : ghost.getWaypoints().entrySet()) {
 			WaypointObject waypointEntry = entry.getValue();
-			if (waypointEntry == null || !waypointEntry.getName().equals(friendName))
+			if (waypointEntry == null || !waypointEntry.getObjectName().equals(friendName))
 				continue;
 
 			waypoint = waypointEntry;
diff --git a/src/resources/commands/callbacks/GotoCmdCallback.java b/src/resources/commands/callbacks/GotoCmdCallback.java
index 8437fac5b..856bfa94a 100644
--- a/src/resources/commands/callbacks/GotoCmdCallback.java
+++ b/src/resources/commands/callbacks/GotoCmdCallback.java
@@ -96,7 +96,7 @@ public class GotoCmdCallback implements ICmdCallback  {
 			return err;
 		}
 		new ObjectTeleportIntent(obj, cell, l).broadcast();
-		return "Successfully teleported "+obj.getName()+" to "+buildingId;
+		return "Successfully teleported "+obj.getObjectName()+" to "+buildingId;
 	}
 	
 }
diff --git a/src/resources/commands/callbacks/QaToolCmdCallback.java b/src/resources/commands/callbacks/QaToolCmdCallback.java
index cc4c26895..ad7f4925b 100644
--- a/src/resources/commands/callbacks/QaToolCmdCallback.java
+++ b/src/resources/commands/callbacks/QaToolCmdCallback.java
@@ -170,7 +170,7 @@ public class QaToolCmdCallback implements ICmdCallback {
 		SuiMessageBox inputBox = new SuiMessageBox(SuiButtons.OK_CANCEL, "Force Delete?", "Are you sure you want to delete this object?");
 		inputBox.addOkButtonCallback("handleDeleteObject", (caller, actor, event, parameters) -> {
 			if (target instanceof CreatureObject && ((CreatureObject) target).isPlayer()) {
-				Log.i("QA", "[%s] Requested deletion of character: %s", player.getUsername(), target.getName());
+				Log.i("QA", "[%s] Requested deletion of character: %s", player.getUsername(), target.getObjectName());
 				new DeleteCharacterIntent((CreatureObject) target).broadcast();
 				Player owner = target.getOwner();
 				if (owner != null)
@@ -239,7 +239,7 @@ public class QaToolCmdCallback implements ICmdCallback {
 			new ObjectTeleportIntent(obj, l).broadcast();
 		else
 			return teleportToRecoveryBuilding(objManager, obj, set.getLong("object_id"), set.getString("cell"), l);
-		return "Sucessfully teleported " + obj.getName() + " to " + loc;
+		return "Sucessfully teleported " + obj.getObjectName() + " to " + loc;
 	}
 	
 	private String teleportToRecoveryBuilding(ObjectManager objManager, SWGObject obj, long buildingId, String cellName, Location l) {
@@ -256,7 +256,7 @@ public class QaToolCmdCallback implements ICmdCallback {
 			return err;
 		}
 		new ObjectTeleportIntent(obj, cell, l).broadcast();
-		return "Successfully teleported " + obj.getName() + " to " + buildingId + "/" + cellName + " " + l;
+		return "Successfully teleported " + obj.getObjectName() + " to " + buildingId + "/" + cellName + " " + l;
 	}
 	
 	private void displayHelp(Player player) {
diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 07689918f..fc32fe9f1 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -333,7 +333,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		this.crc = CRC.getCrc(template);
 	}
 	
-	public void setName(String name) {
+	public void setObjectName(String name) {
 		this.objectName = name;
 	}
 	
@@ -450,7 +450,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		return location.getTerrain();
 	}
 	
-	public String getName() {
+	public String getObjectName() {
 		return objectName;
 	}
 	
diff --git a/src/resources/objects/group/GroupObject.java b/src/resources/objects/group/GroupObject.java
index a208e0a44..e4b8da113 100644
--- a/src/resources/objects/group/GroupObject.java
+++ b/src/resources/objects/group/GroupObject.java
@@ -276,7 +276,7 @@ public class GroupObject extends SWGObject {
 		
 		@Override
 		public byte[] encode() {
-			String name = creature.getName();
+			String name = creature.getObjectName();
 			ByteBuffer bb = ByteBuffer.allocate(10 + name.length());
 			Packet.addLong(bb, creature.getObjectId());
 			Packet.addAscii(bb, name);
@@ -297,7 +297,7 @@ public class GroupObject extends SWGObject {
 		}
 		
 		public String getName() {
-			return creature.getName();
+			return creature.getObjectName();
 		}
 		
 		@Override
diff --git a/src/resources/objects/waypoint/WaypointObject.java b/src/resources/objects/waypoint/WaypointObject.java
index 9fee6f3f7..0262ffaf6 100644
--- a/src/resources/objects/waypoint/WaypointObject.java
+++ b/src/resources/objects/waypoint/WaypointObject.java
@@ -50,7 +50,7 @@ public class WaypointObject extends IntangibleObject implements OutOfBandData {
 		super(objectId, BaselineType.WAYP);
 	}
 
-	public String getName() {
+	public String getObjectName() {
 		return name;
 	}
 
diff --git a/src/resources/player/Player.java b/src/resources/player/Player.java
index ac4bbb676..9c61ee98c 100644
--- a/src/resources/player/Player.java
+++ b/src/resources/player/Player.java
@@ -119,7 +119,7 @@ public class Player implements Comparable<Player> {
 	
 	public String getCharacterName() {
 		if (creatureObject != null)
-			return creatureObject.getName();
+			return creatureObject.getObjectName();
 		return "";
 	}
 	
@@ -162,7 +162,7 @@ public class Player implements Comparable<Player> {
 	public String toString() {
 		String str = "Player[";
 		str += "ID=" + userId + " / " + (creatureObject==null?"null":creatureObject.getObjectId());
-		str += " NAME=" + username + " / " + (creatureObject==null?"null":creatureObject.getName());
+		str += " NAME=" + username + " / " + (creatureObject==null?"null":creatureObject.getObjectName());
 		str += " STATE=" + state;
 		return str + "]";
 	}
diff --git a/src/services/admin/WebserverHandler.java b/src/services/admin/WebserverHandler.java
index ecda3c726..c16b98c09 100644
--- a/src/services/admin/WebserverHandler.java
+++ b/src/services/admin/WebserverHandler.java
@@ -320,7 +320,7 @@ class WebserverHandler {
 		StringBuilder str = new StringBuilder("");
 		Location world = creature.getWorldLocation();
 		str.append(String.format("  Object ID: %s<br />", creature.getObjectId()));
-		str.append(String.format("       Name: %s<br />", creature.getName()));
+		str.append(String.format("       Name: %s<br />", creature.getObjectName()));
 		str.append(String.format("<b>World:</b><br />"));
 		str.append(addLocationData(world));
 		if (creature.getParent() != null) {
diff --git a/src/services/chat/ChatMailService.java b/src/services/chat/ChatMailService.java
index 7c56db1e3..e88c28c9c 100644
--- a/src/services/chat/ChatMailService.java
+++ b/src/services/chat/ChatMailService.java
@@ -187,7 +187,7 @@ public class ChatMailService extends Service {
 			sendPersistentMessage(recipient, mail, MailFlagType.HEADER_ONLY, galaxy);
 			SWGObject sendObj = sender.getCreatureObject();
 			SWGObject recvObj = recipient.getCreatureObject();
-			logChat(sendObj.getObjectId(), sendObj.getName(), recvObj.getObjectId(), recvObj.getName(), mail.getSubject(), mail.getMessage());
+			logChat(sendObj.getObjectId(), sendObj.getObjectName(), recvObj.getObjectId(), recvObj.getObjectName(), mail.getSubject(), mail.getMessage());
 		}
 	}
 	
diff --git a/src/services/combat/CombatManager.java b/src/services/combat/CombatManager.java
index d7f2e1110..80583d150 100644
--- a/src/services/combat/CombatManager.java
+++ b/src/services/combat/CombatManager.java
@@ -495,8 +495,8 @@ public class CombatManager extends Manager {
 		}
 		
 		new BuffIntent("incapWeaken", incapacitator, incapacitated, false).broadcast();
-		new ChatBroadcastIntent(incapacitator.getOwner(), new ProsePackage(new StringId("base_player", "prose_target_incap"), "TT", incapacitated.getName())).broadcast();
-		new ChatBroadcastIntent(incapacitated.getOwner(), new ProsePackage(new StringId("base_player", "prose_victim_incap"), "TT", incapacitator.getName())).broadcast();
+		new ChatBroadcastIntent(incapacitator.getOwner(), new ProsePackage(new StringId("base_player", "prose_target_incap"), "TT", incapacitated.getObjectName())).broadcast();
+		new ChatBroadcastIntent(incapacitated.getOwner(), new ProsePackage(new StringId("base_player", "prose_victim_incap"), "TT", incapacitator.getObjectName())).broadcast();
 	}
 	
 	private void expireIncapacitation(CreatureObject incapacitatedPlayer) {
diff --git a/src/services/combat/CorpseService.java b/src/services/combat/CorpseService.java
index 551bbaec6..be0dce135 100644
--- a/src/services/combat/CorpseService.java
+++ b/src/services/combat/CorpseService.java
@@ -173,7 +173,7 @@ public final class CorpseService extends Service {
 		
 		if(corpse.isPlayer()) {
 			Player corpseOwner = corpse.getOwner();
-			new ChatBroadcastIntent(corpseOwner, new ProsePackage(new StringId("base_player", "prose_victim_dead"), "TT", i.getKiller().getName())).broadcast();
+			new ChatBroadcastIntent(corpseOwner, new ProsePackage(new StringId("base_player", "prose_victim_dead"), "TT", i.getKiller().getObjectName())).broadcast();
 			new ChatBroadcastIntent(corpseOwner, new ProsePackage(new StringId("base_player", "revive_exp_msg"), "TT", CLONE_TIMER + " minutes.")).broadcast();
 			
 			scheduleCloneTimer(corpse);
diff --git a/src/services/commands/EntertainmentService.java b/src/services/commands/EntertainmentService.java
index 0216ef7c6..68a4ff903 100644
--- a/src/services/commands/EntertainmentService.java
+++ b/src/services/commands/EntertainmentService.java
@@ -247,7 +247,7 @@ public class EntertainmentService extends Service {
 					}
 				} else {
 					// While this is a valid target for watching, the target is currently not performing.
-					new ChatBroadcastIntent(actorOwner, new ProsePackage(new StringId("performance", "dance_watch_not_dancing"), "TT", creature.getName())).broadcast();
+					new ChatBroadcastIntent(actorOwner, new ProsePackage(new StringId("performance", "dance_watch_not_dancing"), "TT", creature.getObjectName())).broadcast();
 				}
 			} else {
 				// You can't watch NPCs, regardless of whether they're dancing or not
@@ -369,7 +369,7 @@ public class EntertainmentService extends Service {
 
 	private void startWatching(CreatureObject actor, CreatureObject creature) {
 		actor.setMoodAnimation("entertained");
-		new ChatBroadcastIntent(actor.getOwner(), new ProsePackage(new StringId("performance", "dance_watch_self"), "TT", creature.getName())).broadcast();
+		new ChatBroadcastIntent(actor.getOwner(), new ProsePackage(new StringId("performance", "dance_watch_self"), "TT", creature.getObjectName())).broadcast();
 		actor.setPerformanceListenTarget(creature.getObjectId());
 	}
 	private void stopWatching(CreatureObject actor, boolean displaySystemMessage) {
diff --git a/src/services/galaxy/travel/TravelService.java b/src/services/galaxy/travel/TravelService.java
index e8c027c6f..1a106782d 100644
--- a/src/services/galaxy/travel/TravelService.java
+++ b/src/services/galaxy/travel/TravelService.java
@@ -516,7 +516,7 @@ public class TravelService extends Service {
 			new ChatBroadcastIntent(player, "@travel:wrong_shuttle").broadcast();
 		} else if (distanceToNearestPoint <= TICKET_USE_RADIUS) {
 			// They can use their ticket if they're within range.
-			Log.i(this, "%s/%s is traveling from %s to %s", player.getUsername(), traveler.getName(), nearestPoint.getName(), getDestinationPoint(ticket).getName());
+			Log.i(this, "%s/%s is traveling from %s to %s", player.getUsername(), traveler.getObjectName(), nearestPoint.getName(), getDestinationPoint(ticket).getName());
 			teleportAndDestroyTicket(getDestinationPoint(ticket), ticket, traveler);
 		} else {
 			new ChatBroadcastIntent(player, "@travel:boarding_too_far").broadcast();
diff --git a/src/services/group/GroupService.java b/src/services/group/GroupService.java
index 99fc47931..ff9ecbe30 100644
--- a/src/services/group/GroupService.java
+++ b/src/services/group/GroupService.java
@@ -278,7 +278,7 @@ public class GroupService extends Service {
 			return;
 		
 		// Set the group leader to newLeader
-		sendGroupSystemMessage(group, "new_leader", "TU", newLeader.getName());
+		sendGroupSystemMessage(group, "new_leader", "TU", newLeader.getObjectName());
 		group.setLeader(newLeader);
 	}
 	
@@ -348,7 +348,7 @@ public class GroupService extends Service {
 		Assert.notNull(group);
 		
 		if (group.getLeaderId() != inviter.getObjectId()) {
-			sendSystemMessage(player, "join_inviter_not_leader", "TT", inviter.getName());
+			sendSystemMessage(player, "join_inviter_not_leader", "TT", inviter.getObjectName());
 			return;
 		}
 		if (group.isFull()) {
@@ -394,7 +394,7 @@ public class GroupService extends Service {
 	
 	private void sendInvite(Player groupLeader, CreatureObject invitee, long groupId) {
 		sendSystemMessage(invitee.getOwner(), "invite_target", "TT", groupLeader.getCharacterName());
-		sendSystemMessage(groupLeader, "invite_leader", "TT", invitee.getName());
+		sendSystemMessage(groupLeader, "invite_leader", "TT", invitee.getObjectName());
 		
 		// Set the invite data to the current group ID
 		if (groupId == 0)
diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java
index 0bb4fb71b..05de97972 100644
--- a/src/services/player/LoginService.java
+++ b/src/services/player/LoginService.java
@@ -159,7 +159,7 @@ public class LoginService extends Service {
 		boolean success = obj != null && deleteCharacter(obj);
 		if (success) {
 			new DestroyObjectIntent(obj).broadcast();
-			Log.i(this, "Deleted character %s for user %s", ((CreatureObject)obj).getName(), player.getUsername());
+			Log.i(this, "Deleted character %s for user %s", ((CreatureObject)obj).getObjectName(), player.getUsername());
 		} else {
 			Log.e(this, "Could not delete character! Character: ID: " + request.getPlayerId() + " / " + obj);
 		}
diff --git a/src/services/player/creation/CharacterCreation.java b/src/services/player/creation/CharacterCreation.java
index 8f74b4ba8..aef3bc8e1 100644
--- a/src/services/player/creation/CharacterCreation.java
+++ b/src/services/player/creation/CharacterCreation.java
@@ -147,7 +147,7 @@ public class CharacterCreation {
 		creatureObj.setRace(Race.getRaceByFile(create.getRace()));
 		creatureObj.setAppearanceData(create.getCharCustomization());
 		creatureObj.setHeight(create.getHeight());
-		creatureObj.setName(create.getName());
+		creatureObj.setObjectName(create.getName());
 		creatureObj.setPvpFlags(PvpFlag.PLAYER);
 		creatureObj.setVolume(0x000F4240);
 		new GrantSkillIntent(GrantSkillIntent.IntentType.GRANT, create.getStartingPhase(), creatureObj, true).broadcast();
diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java
index abb45d6b5..00d09501a 100644
--- a/src/services/spawn/SpawnerService.java
+++ b/src/services/spawn/SpawnerService.java
@@ -258,7 +258,7 @@ public final class SpawnerService extends Service {
 		SWGObject spawnerObjectParent = spawnerObject.getParent();
 		object.setLocation(spawnerObject.getLocation());
 		
-		object.setName(spawner.getCreatureName());
+		object.setObjectName(spawner.getCreatureName());
 		object.setLevel(spawner.getCombatLevel());
 		object.setDifficulty(spawner.getCreatureDifficulty());
 		object.setMaxHealth(spawner.getMaxHealth());
@@ -295,7 +295,7 @@ public final class SpawnerService extends Service {
 				creature.addOptionFlags(OptionFlag.INVULNERABLE);
 				break;
 			default:
-				Log.w(this, "An unknown attackable type of %s was specified for %s", flagString, creature.getName());
+				Log.w(this, "An unknown attackable type of %s was specified for %s", flagString, creature.getObjectName());
 				break;
 		}
 	}
diff --git a/test/resources/objects/awareness/TestTerrainMap.java b/test/resources/objects/awareness/TestTerrainMap.java
index 4a17f4090..343953f92 100644
--- a/test/resources/objects/awareness/TestTerrainMap.java
+++ b/test/resources/objects/awareness/TestTerrainMap.java
@@ -130,7 +130,7 @@ public class TestTerrainMap {
 		map.setCallback(callback);
 		try {
 			map.start();
-			creature.setName("testTatooine");
+			creature.setObjectName("testTatooine");
 			Location creatureLocation = new Location(3500, 5, -4800, Terrain.TATOOINE);
 			for (SWGObject obj : tatObjects) {
 				double range = Math.min(1024*Math.sqrt(2), Math.max(obj.getLoadRange(), creature.getLoadRange()));