Modified several table names.

12 files changed, 79 insertions, 75 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs
index 6bc2a9274..a0297f529 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs
@@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class ACTION
+    public partial class ACTION_TYPES
     {
         public long ID { get; set; }
         public string GUID { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs
index 636c9d31a..3ec964cb8 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs
@@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class EVENT
+    public partial class EVENT_TYPES
     {
         public long ID { get; set; }
         public string GUID { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs
index 3c1c30eec..0e7ba0913 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENTS_ACTIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs
@@ -12,13 +12,13 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class EVENTS_ACTIONS
+    public partial class EVENT_TYPES_ACTIONS
     {
         public long ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
-        public string EVENT_GUID { get; set; }
-        public string ACTION_GUID { get; set; }
+        public string EVENT_TYPE_GUID { get; set; }
+        public string ACTION_TYPE_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
index f97fed77c..cb94d5f67 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
@@ -20,7 +20,7 @@ namespace Tango.DAL.Local.DB
         public bool DELETED { get; set; }
         public string CONFIGURATION_GUID { get; set; }
         public string DISPENSER_GUID { get; set; }
-        public string LIQUID_GUID { get; set; }
+        public string LIQUID_TYPE_GUID { get; set; }
         public string CARTRIDGE_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs
index 9c70544ca..652d219ba 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs
@@ -12,7 +12,7 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class LIQUID
+    public partial class LIQUID_TYPES
     {
         public long ID { get; set; }
         public string GUID { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs
index 9d613062c..cd8865526 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUIDS_RMLS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs
@@ -12,13 +12,13 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class LIQUIDS_RMLS
+    public partial class LIQUID_TYPES_RMLS
     {
         public long ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
-        public string LIQUID_GUID { get; set; }
+        public string LIQUID_TYPE_GUID { get; set; }
         public string RML_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
index 38ae0a849..10f77068c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -25,7 +25,7 @@ namespace Tango.DAL.Local.DB
             throw new UnintentionalCodeFirstException();
         }
     
-        public virtual DbSet<ACTION> ACTIONS { get; set; }
+        public virtual DbSet<ACTION_TYPES> ACTION_TYPES { get; set; }
         public virtual DbSet<ADDRESS> ADDRESSES { get; set; }
         public virtual DbSet<APPLICATION_DISPLAY_PANEL_VERSIONS> APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; }
         public virtual DbSet<APPLICATION_FIRMWARE_VERSIONS> APPLICATION_FIRMWARE_VERSIONS { get; set; }
@@ -39,15 +39,15 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<DISPENSER> DISPENSERS { get; set; }
         public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; }
         public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { get; set; }
-        public virtual DbSet<EVENT> EVENTS { get; set; }
-        public virtual DbSet<EVENTS_ACTIONS> EVENTS_ACTIONS { get; set; }
+        public virtual DbSet<EVENT_TYPES> EVENT_TYPES { get; set; }
+        public virtual DbSet<EVENT_TYPES_ACTIONS> EVENT_TYPES_ACTIONS { get; set; }
         public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; }
         public virtual DbSet<FIBER_SYNTHESISES> FIBER_SYNTHESISES { get; set; }
         public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; }
         public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; }
         public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; }
-        public virtual DbSet<LIQUID> LIQUIDS { get; set; }
-        public virtual DbSet<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; }
+        public virtual DbSet<LIQUID_TYPES> LIQUID_TYPES { get; set; }
+        public virtual DbSet<LIQUID_TYPES_RMLS> LIQUID_TYPES_RMLS { get; set; }
         public virtual DbSet<MACHINE_VERSIONS> MACHINE_VERSIONS { get; set; }
         public virtual DbSet<MACHINE> MACHINES { get; set; }
         public virtual DbSet<MACHINES_CONFIGURATIONS> MACHINES_CONFIGURATIONS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index bd71d7457..261cec120 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -5,7 +5,7 @@
     <!-- SSDL content -->
     <edmx:StorageModels>
     <Schema Namespace="LocalModel.Store" Provider="System.Data.SQLite.EF6" ProviderManifestToken="Data Source=D:\Development\Tango\Software\DB\Tango.db" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
-        <EntityType Name="ACTIONS">
+        <EntityType Name="ACTION_TYPES">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -158,7 +158,7 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
         </EntityType>
-        <EntityType Name="EVENTS">
+        <EntityType Name="EVENT_TYPES">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -169,7 +169,7 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
-        <EntityType Name="EVENTS_ACTIONS">
+        <EntityType Name="EVENT_TYPES_ACTIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -177,8 +177,8 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
-          <Property Name="EVENT_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="ACTION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="EVENT_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="ACTION_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="FIBER_SHAPES">
           <Key>
@@ -217,7 +217,7 @@
           <Property Name="DELETED" Type="bit" Nullable="false" />
           <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="DISPENSER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="LIQUID_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="CARTRIDGE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
@@ -229,7 +229,7 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
         </EntityType>
-        <EntityType Name="LIQUIDS">
+        <EntityType Name="LIQUID_TYPES">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -241,7 +241,7 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="VERSION" Type="real" Nullable="false" />
         </EntityType>
-        <EntityType Name="LIQUIDS_RMLS">
+        <EntityType Name="LIQUID_TYPES_RMLS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -249,7 +249,7 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
-          <Property Name="LIQUID_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="RML_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="MACHINE_VERSIONS">
@@ -275,6 +275,7 @@
           <Property Name="PRODUCTION_DATE" Type="datetime" Nullable="false" />
           <Property Name="ORGANIZATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="MACHINE_VERSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="MACHINES_CONFIGURATIONS">
           <Key>
@@ -296,7 +297,7 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
           <Property Name="MACHINE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="EVENT_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="EVENT_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="USER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="DATE_TIME" Type="datetime" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
@@ -446,7 +447,7 @@
           <Property Name="ROLE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityContainer Name="LocalModelStoreContainer">
-          <EntitySet Name="ACTIONS" EntityType="Self.ACTIONS" store:Type="Tables" />
+          <EntitySet Name="ACTION_TYPES" EntityType="Self.ACTION_TYPES" store:Type="Tables" />
           <EntitySet Name="ADDRESSES" EntityType="Self.ADDRESSES" store:Type="Tables" />
           <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" store:Type="Tables" />
           <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" store:Type="Tables" />
@@ -460,15 +461,15 @@
           <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" store:Type="Tables" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" store:Type="Tables" />
           <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" store:Type="Tables" />
-          <EntitySet Name="EVENTS" EntityType="Self.EVENTS" store:Type="Tables" />
-          <EntitySet Name="EVENTS_ACTIONS" EntityType="Self.EVENTS_ACTIONS" store:Type="Tables" />
+          <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" store:Type="Tables" />
+          <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="Self.EVENT_TYPES_ACTIONS" store:Type="Tables" />
           <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" store:Type="Tables" />
           <EntitySet Name="FIBER_SYNTHESISES" EntityType="Self.FIBER_SYNTHESISES" store:Type="Tables" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" store:Type="Tables" />
           <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" store:Type="Tables" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" store:Type="Tables" />
-          <EntitySet Name="LIQUIDS" EntityType="Self.LIQUIDS" store:Type="Tables" />
-          <EntitySet Name="LIQUIDS_RMLS" EntityType="Self.LIQUIDS_RMLS" store:Type="Tables" />
+          <EntitySet Name="LIQUID_TYPES" EntityType="Self.LIQUID_TYPES" store:Type="Tables" />
+          <EntitySet Name="LIQUID_TYPES_RMLS" EntityType="Self.LIQUID_TYPES_RMLS" store:Type="Tables" />
           <EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" store:Type="Tables" />
           <EntitySet Name="MACHINES" EntityType="Self.MACHINES" store:Type="Tables" />
           <EntitySet Name="MACHINES_CONFIGURATIONS" EntityType="Self.MACHINES_CONFIGURATIONS" store:Type="Tables" />
@@ -491,7 +492,7 @@
     <edmx:ConceptualModels>
       <Schema Namespace="LocalModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
         <EntityContainer Name="LocalDB" annotation:LazyLoadingEnabled="true">
-          <EntitySet Name="ACTIONS" EntityType="LocalModel.ACTION" />
+          <EntitySet Name="ACTION_TYPES" EntityType="LocalModel.ACTION_TYPES" />
           <EntitySet Name="ADDRESSES" EntityType="LocalModel.ADDRESS" />
           <EntitySet Name="APPLICATION_DISPLAY_PANEL_VERSIONS" EntityType="LocalModel.APPLICATION_DISPLAY_PANEL_VERSIONS" />
           <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" />
@@ -505,15 +506,15 @@
           <EntitySet Name="DISPENSERS" EntityType="LocalModel.DISPENSER" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" />
           <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" />
-          <EntitySet Name="EVENTS" EntityType="LocalModel.EVENT" />
-          <EntitySet Name="EVENTS_ACTIONS" EntityType="LocalModel.EVENTS_ACTIONS" />
+          <EntitySet Name="EVENT_TYPES" EntityType="LocalModel.EVENT_TYPES" />
+          <EntitySet Name="EVENT_TYPES_ACTIONS" EntityType="LocalModel.EVENT_TYPES_ACTIONS" />
           <EntitySet Name="FIBER_SHAPES" EntityType="LocalModel.FIBER_SHAPES" />
           <EntitySet Name="FIBER_SYNTHESISES" EntityType="LocalModel.FIBER_SYNTHESISES" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="LocalModel.HARDWARE_VERSIONS" />
           <EntitySet Name="IDS_PACKS" EntityType="LocalModel.IDS_PACKS" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" />
-          <EntitySet Name="LIQUIDS" EntityType="LocalModel.LIQUID" />
-          <EntitySet Name="LIQUIDS_RMLS" EntityType="LocalModel.LIQUIDS_RMLS" />
+          <EntitySet Name="LIQUID_TYPES" EntityType="LocalModel.LIQUID_TYPES" />
+          <EntitySet Name="LIQUID_TYPES_RMLS" EntityType="LocalModel.LIQUID_TYPES_RMLS" />
           <EntitySet Name="MACHINE_VERSIONS" EntityType="LocalModel.MACHINE_VERSIONS" />
           <EntitySet Name="MACHINES" EntityType="LocalModel.MACHINE" />
           <EntitySet Name="MACHINES_CONFIGURATIONS" EntityType="LocalModel.MACHINES_CONFIGURATIONS" />
@@ -531,7 +532,7 @@
           <EntitySet Name="USERS" EntityType="LocalModel.USER" />
           <EntitySet Name="USERS_ROLES" EntityType="LocalModel.USERS_ROLES" />
         </EntityContainer>
-        <EntityType Name="ACTION">
+        <EntityType Name="ACTION_TYPES">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -684,7 +685,7 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
         </EntityType>
-        <EntityType Name="EVENT">
+        <EntityType Name="EVENT_TYPES">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -695,7 +696,7 @@
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
-        <EntityType Name="EVENTS_ACTIONS">
+        <EntityType Name="EVENT_TYPES_ACTIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -703,8 +704,8 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
-          <Property Name="EVENT_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="ACTION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="EVENT_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="ACTION_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="FIBER_SHAPES">
           <Key>
@@ -743,7 +744,7 @@
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
@@ -755,7 +756,7 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
         </EntityType>
-        <EntityType Name="LIQUID">
+        <EntityType Name="LIQUID_TYPES">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -767,7 +768,7 @@
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="VERSION" Type="Double" Nullable="false" />
         </EntityType>
-        <EntityType Name="LIQUIDS_RMLS">
+        <EntityType Name="LIQUID_TYPES_RMLS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -775,7 +776,7 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
-          <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="MACHINE_VERSIONS">
@@ -801,6 +802,7 @@
           <Property Name="PRODUCTION_DATE" Type="DateTime" Nullable="false" />
           <Property Name="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="MACHINE_VERSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="MACHINES_CONFIGURATIONS">
           <Key>
@@ -822,7 +824,7 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="EVENT_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="EVENT_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="USER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="DATE_TIME" Type="DateTime" Nullable="false" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
@@ -977,9 +979,9 @@
     <edmx:Mappings>
       <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
         <EntityContainerMapping StorageEntityContainer="LocalModelStoreContainer" CdmEntityContainer="LocalDB">
-          <EntitySetMapping Name="ACTIONS">
-            <EntityTypeMapping TypeName="LocalModel.ACTION">
-              <MappingFragment StoreEntitySet="ACTIONS">
+          <EntitySetMapping Name="ACTION_TYPES">
+            <EntityTypeMapping TypeName="LocalModel.ACTION_TYPES">
+              <MappingFragment StoreEntitySet="ACTION_TYPES">
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
@@ -1144,9 +1146,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="EVENTS">
-            <EntityTypeMapping TypeName="LocalModel.EVENT">
-              <MappingFragment StoreEntitySet="EVENTS">
+          <EntitySetMapping Name="EVENT_TYPES">
+            <EntityTypeMapping TypeName="LocalModel.EVENT_TYPES">
+              <MappingFragment StoreEntitySet="EVENT_TYPES">
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
@@ -1156,11 +1158,11 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="EVENTS_ACTIONS">
-            <EntityTypeMapping TypeName="LocalModel.EVENTS_ACTIONS">
-              <MappingFragment StoreEntitySet="EVENTS_ACTIONS">
-                <ScalarProperty Name="ACTION_GUID" ColumnName="ACTION_GUID" />
-                <ScalarProperty Name="EVENT_GUID" ColumnName="EVENT_GUID" />
+          <EntitySetMapping Name="EVENT_TYPES_ACTIONS">
+            <EntityTypeMapping TypeName="LocalModel.EVENT_TYPES_ACTIONS">
+              <MappingFragment StoreEntitySet="EVENT_TYPES_ACTIONS">
+                <ScalarProperty Name="ACTION_TYPE_GUID" ColumnName="ACTION_TYPE_GUID" />
+                <ScalarProperty Name="EVENT_TYPE_GUID" ColumnName="EVENT_TYPE_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1202,7 +1204,7 @@
             <EntityTypeMapping TypeName="LocalModel.IDS_PACKS">
               <MappingFragment StoreEntitySet="IDS_PACKS">
                 <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" />
-                <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" />
+                <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" />
                 <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" />
                 <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
@@ -1222,9 +1224,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="LIQUIDS">
-            <EntityTypeMapping TypeName="LocalModel.LIQUID">
-              <MappingFragment StoreEntitySet="LIQUIDS">
+          <EntitySetMapping Name="LIQUID_TYPES">
+            <EntityTypeMapping TypeName="LocalModel.LIQUID_TYPES">
+              <MappingFragment StoreEntitySet="LIQUID_TYPES">
                 <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
@@ -1235,11 +1237,11 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="LIQUIDS_RMLS">
-            <EntityTypeMapping TypeName="LocalModel.LIQUIDS_RMLS">
-              <MappingFragment StoreEntitySet="LIQUIDS_RMLS">
+          <EntitySetMapping Name="LIQUID_TYPES_RMLS">
+            <EntityTypeMapping TypeName="LocalModel.LIQUID_TYPES_RMLS">
+              <MappingFragment StoreEntitySet="LIQUID_TYPES_RMLS">
                 <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
-                <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" />
+                <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
@@ -1261,6 +1263,7 @@
           <EntitySetMapping Name="MACHINES">
             <EntityTypeMapping TypeName="LocalModel.MACHINE">
               <MappingFragment StoreEntitySet="MACHINES">
+                <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
                 <ScalarProperty Name="MACHINE_VERSION_GUID" ColumnName="MACHINE_VERSION_GUID" />
                 <ScalarProperty Name="ORGANIZATION_GUID" ColumnName="ORGANIZATION_GUID" />
                 <ScalarProperty Name="PRODUCTION_DATE" ColumnName="PRODUCTION_DATE" />
@@ -1291,7 +1294,7 @@
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="DATE_TIME" ColumnName="DATE_TIME" />
                 <ScalarProperty Name="USER_GUID" ColumnName="USER_GUID" />
-                <ScalarProperty Name="EVENT_GUID" ColumnName="EVENT_GUID" />
+                <ScalarProperty Name="EVENT_TYPE_GUID" ColumnName="EVENT_TYPE_GUID" />
                 <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
index 350983c76..5bbf17d24 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -5,7 +5,7 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="67415a77da9a47f2810e9bfd67b9921a" Name="Diagram1">
-        <EntityTypeShape EntityType="LocalModel.ACTION" Width="1.5" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.ACTION_TYPES" Width="1.5" PointX="0.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.ADDRESS" Width="1.5" PointX="2.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="4.75" />
@@ -19,15 +19,15 @@
         <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="8.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="8.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="10.75" />
         <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESISES" Width="1.5" PointX="10.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="6.75" />
         <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="10.75" PointY="9.75" />
         <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="2.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID" Width="1.5" PointX="4.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUIDS_RMLS" Width="1.5" PointX="12.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="4.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="12.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="6.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="6.75" PointY="12.75" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs
index b01607300..7bf83f80c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs
@@ -23,5 +23,6 @@ namespace Tango.DAL.Local.DB
         public System.DateTime PRODUCTION_DATE { get; set; }
         public string ORGANIZATION_GUID { get; set; }
         public string MACHINE_VERSION_GUID { get; set; }
+        public string CONFIGURATION_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs
index 599ab3332..2b916274a 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs
@@ -19,7 +19,7 @@ namespace Tango.DAL.Local.DB
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
         public string MACHINE_GUID { get; set; }
-        public string EVENT_GUID { get; set; }
+        public string EVENT_TYPE_GUID { get; set; }
         public string USER_GUID { get; set; }
         public System.DateTime DATE_TIME { get; set; }
         public string DESCRIPTION { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index db5f258a2..14625e59f 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -65,7 +65,7 @@
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="DB\ACTION.cs">
+    <Compile Include="DB\ACTION_TYPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
     <Compile Include="DB\ADDRESS.cs">
@@ -107,10 +107,10 @@
     <Compile Include="DB\EMBEDDED_SOFTWARE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\EVENT.cs">
+    <Compile Include="DB\EVENT_TYPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\EVENTS_ACTIONS.cs">
+    <Compile Include="DB\EVENT_TYPES_ACTIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
     <Compile Include="DB\FIBER_SHAPES.cs">
@@ -128,10 +128,10 @@
     <Compile Include="DB\LINEAR_MASS_DENSITY_UNITS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\LIQUID.cs">
+    <Compile Include="DB\LIQUID_TYPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\LIQUIDS_RMLS.cs">
+    <Compile Include="DB\LIQUID_TYPES_RMLS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
     <Compile Include="DB\LocalADO.Context.cs">