diff --git a/src/catalog/import_vm.go b/src/catalog/import_vm.go
index 0e2de63..b36a403 100644
--- a/src/catalog/import_vm.go
+++ b/src/catalog/import_vm.go
@@ -2,7 +2,6 @@ package catalog
 
 import (
 	"encoding/json"
-	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -96,7 +95,7 @@ func (s *CatalogManifestService) ImportVm(ctx basecontext.ApiContext, r *models.
 				}
 				catalogManifest = models.NewVirtualMachineCatalogManifest()
 
-				catalogManifest.Name = fmt.Sprintf("%v-%v", r.CatalogId, r.Version)
+				catalogManifest.Name = r.Name()
 				catalogManifest.Type = r.Type
 				catalogManifest.Description = r.Description
 				catalogManifest.RequiredClaims = r.RequiredClaims
@@ -117,11 +116,10 @@ func (s *CatalogManifestService) ImportVm(ctx basecontext.ApiContext, r *models.
 					response.AddError(err)
 					break
 				}
-
 			}
 		} else {
 			catalogManifest = models.NewVirtualMachineCatalogManifest()
-			catalogManifest.Name = fmt.Sprintf("%v-%v", r.CatalogId, r.Version)
+			catalogManifest.Name = r.Name()
 			catalogManifest.Type = r.Type
 			catalogManifest.Description = r.Description
 			catalogManifest.RequiredClaims = r.RequiredClaims
diff --git a/src/data/main.go b/src/data/main.go
index e4fda21..051c3e1 100644
--- a/src/data/main.go
+++ b/src/data/main.go
@@ -337,7 +337,6 @@ func (j *JsonDatabase) processSave(ctx basecontext.ApiContext) error {
 	if err = j.copyCurrentDbFileToTemp(ctx, dateTimeForFile); err != nil {
 		ctx.LogDebugf("[Database] Error copying current file to backup: %v", err)
 		j.isSaving = false
-		j.saveMutex.Unlock()
 		return err
 	}