diff --git a/faims-android-app/projects/Gallery_Example/ui_logic.bsh b/faims-android-app/projects/Gallery_Example/ui_logic.bsh
index 26f0477b..d1dfe090 100644
--- a/faims-android-app/projects/Gallery_Example/ui_logic.bsh
+++ b/faims-android-app/projects/Gallery_Example/ui_logic.bsh
@@ -24,7 +24,7 @@ String entity_id;
 int entityCount;
 
 initialise() {
-	fetchEntityList("simple", new FetchCallback() {
+	fetchEntityList("Simple", new FetchCallback() {
 		onFetch(result) {
 			entityCount = result.size() + 1;
 		}
@@ -74,7 +74,7 @@ updateEntity(entity_id) {
 	
 	attributes.add(createEntityAttribute("supervisor", getFieldValue("tabgroup1/tab2/supervisor"), null, null, getFieldCertainty("tabgroup1/tab2/supervisor")));
 	
-	saveArchEnt(entity_id, "simple", null, attributes, new SaveCallback() {
+	saveArchEnt(entity_id, "Simple", null, attributes, new SaveCallback() {
 		onSave(uuid, newRecord) {
 			entity_id = uuid;
 			refreshEntities();
@@ -84,7 +84,7 @@ updateEntity(entity_id) {
 }
 
 refreshEntities() {
-	fetchEntityList("simple", new FetchCallback() {
+	fetchEntityList("Simple", new FetchCallback() {
 		onFetch(result) {		
 			populateDropDown("tabgroup1/tab3/entity", result);
 		}
diff --git a/faims-android-app/projects/Gallery_Example/ui_schema.xml b/faims-android-app/projects/Gallery_Example/ui_schema.xml
index 7240b353..1b01dd5e 100644
--- a/faims-android-app/projects/Gallery_Example/ui_schema.xml
+++ b/faims-android-app/projects/Gallery_Example/ui_schema.xml
@@ -55,7 +55,7 @@
         </select1>
       </group>
     </group>
-    <group ref="tabgroup1" faims_archent_type="simpleentity">
+    <group ref="tabgroup1" faims_archent_type="Simple">
       <label>Simple Entity Example</label>
       <group ref="tab1">
         <label>Entity Tab1</label>
diff --git a/faims-android-app/projects/Map Example/data_schema.xml b/faims-android-app/projects/Map Example/data_schema.xml
index 7ce76a47..79f1c99e 100755
--- a/faims-android-app/projects/Map Example/data_schema.xml	
+++ b/faims-android-app/projects/Map Example/data_schema.xml	
@@ -44,7 +44,7 @@
     </property>
   </RelationshipElement>
   
-  <ArchaeologicalElement name="SimpleEntity">
+  <ArchaeologicalElement name="simpleentity">
     <description>
       An simple entity
     </description>
diff --git a/faims-android-app/projects/Map Example/ui_logic.bsh b/faims-android-app/projects/Map Example/ui_logic.bsh
index 85a84cbf..956febe1 100755
--- a/faims-android-app/projects/Map Example/ui_logic.bsh	
+++ b/faims-android-app/projects/Map Example/ui_logic.bsh	
@@ -708,7 +708,7 @@ updateEntity(String entityId) {
 
 	List attributes = createAttributeList();
 	if (entityId == null) {
-		attributes.add(createEntityAttribute("entity", "Simple " + entityCount++, null, null, null));
+		attributes.add(createEntityAttribute("entity", "simpleentity" + entityCount++, null, null, null));
 	}
 	attributes.add(createEntityAttribute("name", getFieldValue("tabgroup2/tab2/name"), null, null, getFieldCertainty("tabgroup2/tab2/name")));
 	attributes.add(createEntityAttribute("value", getFieldAnnotation("tabgroup2/tab2/value"), null, getFieldValue("tabgroup2/tab2/value"), getFieldCertainty("tabgroup2/tab2/value")));
@@ -1060,7 +1060,7 @@ updateUIEntity(String entityId) {
 
 	List attributes = createAttributeList();
 	if (entityId == null) {
-		attributes.add(createEntityAttribute("entity", "Simple " + entityCount++, null, null, null));
+		attributes.add(createEntityAttribute("entity", "simpleentity " + entityCount++, null, null, null));
 	}
 	attributes.add(createEntityAttribute("name", getFieldValue("tabgroup5/tab2/name"), null, null, getFieldCertainty("tabgroup5/tab2/name")));
 	attributes.add(createEntityAttribute("value", getFieldAnnotation("tabgroup5/tab2/value"), null, getFieldValue("tabgroup5/tab2/value"), getFieldCertainty("tabgroup5/tab2/value")));
@@ -1191,4 +1191,4 @@ loadUIRelationship(relId) {
 			showTab("tabgroup5/tab3");
 		}
 	});
-}
\ No newline at end of file
+}
diff --git a/faims-android-app/projects/Sync Example/ui_logic.bsh b/faims-android-app/projects/Sync Example/ui_logic.bsh
index ca4aea6b..81ba8bd6 100644
--- a/faims-android-app/projects/Sync Example/ui_logic.bsh	
+++ b/faims-android-app/projects/Sync Example/ui_logic.bsh	
@@ -239,7 +239,7 @@ closeRelationship() {
 onEvent("tabgroup2/tab1/close", "click", "closeRelationship()");
 
 loadRelationships() {
-	fetchRelationshipList("abovebelow", new FetchCallback() {
+	fetchRelationshipList("AboveBelow", new FetchCallback() {
 		onFetch(result) {
 			populateDropDown("tabgroup2/tab2/relationships", result);
 		}
@@ -372,7 +372,7 @@ loadMembers() {
 		}
 	});
 	
-	fetchRelationshipList("abovebelow", new FetchCallback() {
+	fetchRelationshipList("AboveBelow", new FetchCallback() {
 		onFetch(result) {
 			populateDropDown("tabgroup4/tab1/relationships", result);
 		}
diff --git a/faims-android-app/projects/Testing Modules/Logic /data_schema.xml b/faims-android-app/projects/Testing Modules/Logic/data_schema.xml
similarity index 100%
rename from faims-android-app/projects/Testing Modules/Logic /data_schema.xml
rename to faims-android-app/projects/Testing Modules/Logic/data_schema.xml
diff --git a/faims-android-app/projects/Testing Modules/Logic /ui_logic.bsh b/faims-android-app/projects/Testing Modules/Logic/ui_logic.bsh
similarity index 100%
rename from faims-android-app/projects/Testing Modules/Logic /ui_logic.bsh
rename to faims-android-app/projects/Testing Modules/Logic/ui_logic.bsh
diff --git a/faims-android-app/projects/Testing Modules/Logic /ui_schema.xml b/faims-android-app/projects/Testing Modules/Logic/ui_schema.xml
similarity index 100%
rename from faims-android-app/projects/Testing Modules/Logic /ui_schema.xml
rename to faims-android-app/projects/Testing Modules/Logic/ui_schema.xml
diff --git a/faims-android-app/projects/Testing Modules/Tracklog Module /data_schema.xml b/faims-android-app/projects/Testing Modules/Tracklog Module/data_schema.xml
similarity index 100%
rename from faims-android-app/projects/Testing Modules/Tracklog Module /data_schema.xml
rename to faims-android-app/projects/Testing Modules/Tracklog Module/data_schema.xml
diff --git a/faims-android-app/projects/Testing Modules/Tracklog Module /ui_logic.bsh b/faims-android-app/projects/Testing Modules/Tracklog Module/ui_logic.bsh
similarity index 100%
rename from faims-android-app/projects/Testing Modules/Tracklog Module /ui_logic.bsh
rename to faims-android-app/projects/Testing Modules/Tracklog Module/ui_logic.bsh
diff --git a/faims-android-app/projects/Testing Modules/Tracklog Module /ui_schema.xml b/faims-android-app/projects/Testing Modules/Tracklog Module/ui_schema.xml
similarity index 100%
rename from faims-android-app/projects/Testing Modules/Tracklog Module /ui_schema.xml
rename to faims-android-app/projects/Testing Modules/Tracklog Module/ui_schema.xml