diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index b7410ee6..de8aae6d 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -18,6 +18,7 @@ using ENI2.Locode;
 using ENI2.Util;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace ENI2.Controls
 {
@@ -73,7 +74,7 @@ namespace ENI2.Controls
                         md.MessageCore = core;
                         md.Status = MaerskData.MDStatus.ID;
                         md.ColM = core.VisitId;
-                        await DBManagerAsync.Save(md);
+                        await DBManagerAsync.SaveAsync(md);
                         _dbWatchDog.UnRegister(core);
                         this.Dispatcher.Invoke(() =>
                         {
@@ -150,7 +151,7 @@ namespace ENI2.Controls
                     maerskData.Remark = el.Text;
 
                     if (maerskData.MessageCore != null)
-                        await DBManagerAsync.Save(maerskData);
+                        await DBManagerAsync.SaveAsync(maerskData);
                 }
                 /*
                 if(e.Column == gridColumnGroup)
@@ -557,9 +558,9 @@ namespace ENI2.Controls
                     md.MessageCore.BSMDStatusInternal = MessageCore.BSMDStatus.TOSEND;
                     md.MessageCore.Incoming = true;
                     md.MessageCore.DefaultReportingPartyId = App.UserId.Value;
-                    await DBManagerAsync.Save(md.MessageCore);
+                    Task<int> saveId = await DBManagerAsync.SaveAsync(md.MessageCore);
                     md.MessageCoreId = md.MessageCore.Id.Value;
-                    await DBManagerAsync.Save(md);
+                    await DBManagerAsync.SaveAsync(md);
 
                     // Meldeklassen für neuen Anlauf erzeugen
                     // TODO: pre-set certain fields taken from Maersk data
diff --git a/bsmd.database/DBManagerAsync.cs b/bsmd.database/DBManagerAsync.cs
index 7960f426..a459dd55 100644
--- a/bsmd.database/DBManagerAsync.cs
+++ b/bsmd.database/DBManagerAsync.cs
@@ -29,7 +29,7 @@ namespace bsmd.database
 
         #region public methods
 
-        public static async Task<int> Save(DatabaseEntity entity)
+        public static async Task<int> SaveAsync(DatabaseEntity entity)
         {
             SqlCommand cmd = new SqlCommand();
             entity.PrepareSave(cmd);
diff --git a/bsmd.database/Util.cs b/bsmd.database/Util.cs
index 865d8563..ec739bbe 100644
--- a/bsmd.database/Util.cs
+++ b/bsmd.database/Util.cs
@@ -269,7 +269,7 @@ namespace bsmd.database
                         message.MessageCore = core;
                         message.MessageCoreId = core.Id;
                         message.MessageNotificationClass = notificationClass;
-                        await DBManagerAsync.Save(message);
+                        await DBManagerAsync.SaveAsync(message);
                         result.Add(message);
                     }
                     else
@@ -297,7 +297,7 @@ namespace bsmd.database
                         if (classElement != null) // null für Visit/Transit
                         {
                             classElement.MessageHeader = message;
-                            await DBManagerAsync.Save(classElement);
+                            await DBManagerAsync.SaveAsync(classElement);
                             message.Elements.Add(classElement);
                         }
                     }