diff --git a/scripts/mobiles/tatooine/tusken_raider.py b/scripts/mobiles/tatooine/tusken_raider.py
index 8daec628..b2747696 100644
--- a/scripts/mobiles/tatooine/tusken_raider.py
+++ b/scripts/mobiles/tatooine/tusken_raider.py
@@ -5,7 +5,7 @@ from java.util import Vector
 def addTemplate(core):
 	mobileTemplate = MobileTemplate()
 	
-	mobileTemplate.setCreatureName('tuskenraider')
+	mobileTemplate.setCreatureName('tusken_raider')
 	mobileTemplate.setLevel(90)
 	mobileTemplate.setDifficulty(0)
 	mobileTemplate.setAttackRange(24)
@@ -15,8 +15,7 @@ def addTemplate(core):
 	mobileTemplate.setTemplates(templates)
 	
 	weaponTemplates = Vector()
-	weaponTemplates.add('object/weapon/ranged/rifle/shared_rifle_e11.iff')
-	weaponTemplates.add('object/weapon/ranged/rifle/shared_rifle_t21.iff')
+	weaponTemplates.add('object/weapon/ranged/rifle/shared_rifle_tusken.iff')
 	mobileTemplate.setWeaponTemplates(weaponTemplates)
 
 	
@@ -24,5 +23,5 @@ def addTemplate(core):
 	mobileTemplate.setDefaultAttack('rangedShot')
 	mobileTemplate.setAttacks(attacks)
 	
-	core.spawnService.addMobileTemplate('tuskenraider', mobileTemplate)
+	core.spawnService.addMobileTemplate('tusken_raider', mobileTemplate)
 	
\ No newline at end of file
diff --git a/src/resources/objects/building/BuildingObject.java b/src/resources/objects/building/BuildingObject.java
index 2c3d0db4..36486462 100644
--- a/src/resources/objects/building/BuildingObject.java
+++ b/src/resources/objects/building/BuildingObject.java
@@ -151,7 +151,7 @@ public class BuildingObject extends TangibleObject implements IPersistent {
 	public Vector<TangibleObject> getItemsList() {
 		Vector<TangibleObject> items = new Vector<TangibleObject>();
 		getCells().forEach(c -> c.viewChildren(c, true, false, (item) -> {
-			if(!(item instanceof CreatureObject))
+			if(!(item instanceof CreatureObject) && item.getTemplate() != "object/tangible/terminal/shared_terminal_player_structure.iff")
 				items.add((TangibleObject) item);
 		}));
 		return items;
diff --git a/src/services/housing/HousingService.java b/src/services/housing/HousingService.java
index e375abe0..50f0c2c5 100644
--- a/src/services/housing/HousingService.java
+++ b/src/services/housing/HousingService.java
@@ -456,7 +456,8 @@ public class HousingService implements INetworkDispatch {
 		Vector<TangibleObject> itemList = building.getItemsList();
 
 		for (int i=0;i<itemList.size();i++){
-			window.addListBoxMenuItem("#"+(i+1)+": " + itemList.get(i).getTemplate(), i);
+			String itemName = (itemList.get(i).getCustomName() != null) ? itemList.get(i).getCustomName() : "@" + itemList.get(i).getStfFilename() + ":" + itemList.get(i).getStfName();
+			window.addListBoxMenuItem(itemName, i);
 		}		
 
 		window.setProperty("btnOk:visible", "True");