diff --git a/MultiTool.Form/CREATE_DATABASE.sql b/MultiTool.Form/CREATE_DATABASE.sql
index 2b909d1..8f683ae 100644
--- a/MultiTool.Form/CREATE_DATABASE.sql
+++ b/MultiTool.Form/CREATE_DATABASE.sql
@@ -38,7 +38,7 @@ ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_MAPPI
 GO
 ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] DROP CONSTRAINT [DF_TBEDI_XML_VALUE_MAPPING_ORDER_KEY]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MANDATORS] DROP CONSTRAINT [DF_TBEDI_XML_MANDATORS_ACTIVE]
+ALTER TABLE [dbo].[TBMT_MANDATORS] DROP CONSTRAINT [DF_TBMT_MANDATORS_ACTIVE]
 GO
 ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ADDED_WHEN]
 GO
@@ -88,9 +88,9 @@ GO
 IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_MAPPING_CONFIG]') AND type in (N'U'))
 DROP TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_MANDATORS]    Script Date: 26.11.2021 16:07:58 ******/
-IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_MANDATORS]') AND type in (N'U'))
-DROP TABLE [dbo].[TBEDI_XML_MANDATORS]
+/****** Object:  Table [dbo].[TBMT_MANDATORS]    Script Date: 26.11.2021 16:07:58 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBMT_MANDATORS]') AND type in (N'U'))
+DROP TABLE [dbo].[TBMT_MANDATORS]
 GO
 /****** Object:  Table [dbo].[TBEDI_XML_TEMPLATE_ITEMS]    Script Date: 26.11.2021 16:07:58 ******/
 IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TEMPLATE_ITEMS]') AND type in (N'U'))
@@ -176,12 +176,12 @@ CREATE TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS](
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
-/****** Object:  Table [dbo].[TBEDI_XML_MANDATORS]    Script Date: 26.11.2021 16:07:58 ******/
+/****** Object:  Table [dbo].[TBMT_MANDATORS]    Script Date: 26.11.2021 16:07:58 ******/
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
 GO
-CREATE TABLE [dbo].[TBEDI_XML_MANDATORS](
+CREATE TABLE [dbo].[TBMT_MANDATORS](
 	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](50) NULL,
 	[ORDER_KEY] [int] NULL,
@@ -191,7 +191,7 @@ CREATE TABLE [dbo].[TBEDI_XML_MANDATORS](
 	[ADDED_WHEN] [datetime] NULL,
 	[CHANGED_WHO] [nvarchar](50) NULL,
 	[CHANGED_WHEN] [datetime] NULL,
- CONSTRAINT [PK_TBEDI_XML_MANDATORS] PRIMARY KEY CLUSTERED 
+ CONSTRAINT [PK_TBMT_MANDATORS] PRIMARY KEY CLUSTERED 
 (
 	[GUID] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
@@ -407,13 +407,13 @@ INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ([GUID], [ORDER_KEY], [XML_NAME], [XML_T
 GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATE_ITEMS] OFF
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_MANDATORS] ON 
+SET IDENTITY_INSERT [dbo].[TBMT_MANDATORS] ON 
 GO
-INSERT [dbo].[TBEDI_XML_MANDATORS] ([GUID], [NAME], [ORDER_KEY], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'SHGT', 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_MANDATORS] ([GUID], [NAME], [ORDER_KEY], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (1, N'SHGT', 1, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-INSERT [dbo].[TBEDI_XML_MANDATORS] ([GUID], [NAME], [ORDER_KEY], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'SIVT', 2, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
+INSERT [dbo].[TBMT_MANDATORS] ([GUID], [NAME], [ORDER_KEY], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (2, N'SIVT', 2, 1, NULL, N'DEFAULT', NULL, NULL, NULL)
 GO
-SET IDENTITY_INSERT [dbo].[TBEDI_XML_MANDATORS] OFF
+SET IDENTITY_INSERT [dbo].[TBMT_MANDATORS] OFF
 GO
 SET IDENTITY_INSERT [dbo].[TBEDI_XML_MAPPING_CONFIG] ON 
 GO
@@ -537,7 +537,7 @@ ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_TEMPL
 GO
 ALTER TABLE [dbo].[TBEDI_XML_TEMPLATE_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_TEMPLATE_ITEMS_ADDED_WHEN]  DEFAULT (getdate()) FOR [ADDED_WHEN]
 GO
-ALTER TABLE [dbo].[TBEDI_XML_MANDATORS] ADD  CONSTRAINT [DF_TBEDI_XML_MANDATORS_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
+ALTER TABLE [dbo].[TBMT_MANDATORS] ADD  CONSTRAINT [DF_TBMT_MANDATORS_ACTIVE]  DEFAULT ((1)) FOR [ACTIVE]
 GO
 ALTER TABLE [dbo].[TBEDI_XML_MAPPING_CONFIG] ADD  CONSTRAINT [DF_TBEDI_XML_VALUE_MAPPING_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
 GO
diff --git a/MultiTool.Shared/Templates/TemplateLoader.vb b/MultiTool.Shared/Templates/TemplateLoader.vb
index a8973f4..7a5f2ff 100644
--- a/MultiTool.Shared/Templates/TemplateLoader.vb
+++ b/MultiTool.Shared/Templates/TemplateLoader.vb
@@ -18,7 +18,7 @@ Namespace Templates
 
         Private Const SQL_VWEDI_XML_ITEMS = "SELECT * FROM [DD_ECM].[dbo].[VWEDI_XML_ITEMS]"
         Private Const SQL_VWEDI_XML_MAPPING = "SELECT * FROM [DD_ECM].[dbo].[VWEDI_XML_MAPPING]"
-        Private Const SQL_TBEDI_XML_MANDATORS = "SELECT * FROM [DD_ECM].[dbo].[TBEDI_XML_MANDATORS] ORDER BY ORDER_KEY"
+        Private Const SQL_TBMT_MANDATORS = "SELECT * FROM [DD_ECM].[dbo].[TBMT_MANDATORS] ORDER BY ORDER_KEY"
         Private Const SQL_TBMT_CONFIG = "SELECT * FROM [DD_ECM].[dbo].[TBMT_CONFIG]"
         Private Const SQL_TBEDI_XML_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBEDI_XML_TEMPLATES]"
 
@@ -131,7 +131,7 @@ Namespace Templates
 
         Public Async Function LoadMandatorConfiguration() As Task(Of Boolean)
             Try
-                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBEDI_XML_MANDATORS)
+                Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_TBMT_MANDATORS)
                 Dim oMandatorConfig As New MandatorConfig
 
                 For Each oRow As DataRow In oTable.Rows