Some minor tweaks to the java source generation code.
diff --git a/tools/org.eclipse.persistence.tools.gen.db/resource/templates/xml_entities/main.xml.vm b/tools/org.eclipse.persistence.tools.gen.db/resource/templates/xml_entities/main.xml.vm
index cb33c56..7ea552e 100644
--- a/tools/org.eclipse.persistence.tools.gen.db/resource/templates/xml_entities/main.xml.vm
+++ b/tools/org.eclipse.persistence.tools.gen.db/resource/templates/xml_entities/main.xml.vm
@@ -1,7 +1,6 @@
 #### Entity ####
 	<entity class="${table.qualifiedClassName}" access="VIRTUAL">
-#if (!$table.defaultname)
-		<table name=$customizer.convertToXmlStringLiteral(${table.name})/>
+	<table name=$customizer.convertToXmlStringLiteral(${table.name})/>
 #end
 #### Mappings ####
 		<attributes>
diff --git a/tools/org.eclipse.persistence.tools.gen.nosql/templates/java_entities/embeddable.java.vm b/tools/org.eclipse.persistence.tools.gen.nosql/templates/java_entities/embeddable.java.vm
index 06dec95..713e031 100644
--- a/tools/org.eclipse.persistence.tools.gen.nosql/templates/java_entities/embeddable.java.vm
+++ b/tools/org.eclipse.persistence.tools.gen.nosql/templates/java_entities/embeddable.java.vm
@@ -6,10 +6,12 @@
 import java.util.*;
 import javax.persistence.*;
 import org.eclipse.persistence.nosql.annotations.*;
+import static org.eclipse.persistence.nosql.annotations.DataFormatType.*;
 
 /**
  * The persistent class generated for the "${entity.getClassName()}" nested
  * column.
  */
 @Embeddable
+@NoSql(dataFormat = MAPPED)
 #parse("mapped_class.java.vm")
\ No newline at end of file