1 files changed, 4 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index 301b9f58c..7e577bbca 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -4,9 +4,10 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
-namespace Tango.DAL.Remote.ObservableEntities
+namespace Tango.DAL.Observables
 {
-    public class @(Model.Name) : ObservableEntity<@(Model.TableName)>
+    [EntityFieldName("@(Model.TableName)")]
+    public class @(Model.Name) : ObservableEntity<@(Model.EntityName)>
     {
         @foreach (var prop in Model.Fields)
         {
@@ -36,7 +37,7 @@ namespace Tango.DAL.Remote.ObservableEntities
         /// Initializes a new instance of the <see cref="@(Model.Name)" /> class.
         /// </summary>
         /// <param name="entity">The entity.</param>
-        public @(Model.Name)(@(Model.TableName) entity) : base(entity)
+        public @(Model.Name)(@(Model.EntityName) entity) : base(entity)
         {
             Init();
             MapEntityToObservable(entity, this);