diff --git a/application/src/main/java/org/thingsboard/server/controller/AssetController.java b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
index 15fcfa84ff..8de614d577 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AssetController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
@@ -145,7 +145,7 @@ public class AssetController extends BaseController {
                                    "UNIQUIFY policy appends a suffix to the entity name, if a name conflict occurs.")
                            @RequestParam(name = "policy", defaultValue = "FAIL") NameConflictPolicy policy,
                            @Parameter(description = "Optional value of name suffix separator used by UNIQUIFY policy. By default, underscore separator is used. " +
-                                   "For example, strategy is UNIQUIFY, separator is '-'; if a name conflict occurs for customer asset 'Office A', " +
+                                   "For example, strategy is UNIQUIFY, separator is '-'; if a name conflict occurs for asset 'Office A', " +
                                    "created asset will have name like 'Office A-7fsh4f'.")
                            @RequestParam(name = "separator", defaultValue = "_") String separator) throws Exception {
         asset.setTenantId(getTenantId());
diff --git a/application/src/main/java/org/thingsboard/server/service/device/DeviceBulkImportService.java b/application/src/main/java/org/thingsboard/server/service/device/DeviceBulkImportService.java
index 952756210c..7bd0dc06ea 100644
--- a/application/src/main/java/org/thingsboard/server/service/device/DeviceBulkImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/device/DeviceBulkImportService.java
@@ -130,7 +130,7 @@ public class DeviceBulkImportService extends AbstractBulkImportService<Device> {
         }
         device.setDeviceProfileId(deviceProfile.getId());
 
-        return tbDeviceService.saveDeviceWithCredentials(device, deviceCredentials, NameConflictStrategy.DEFAULT, user);
+        return tbDeviceService.saveDeviceWithCredentials(device, deviceCredentials, user);
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/SimpleTbEntityService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/SimpleTbEntityService.java
index 84d606251c..61d52f00bb 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/SimpleTbEntityService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/SimpleTbEntityService.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.entitiy;
 
-import org.thingsboard.server.common.data.NameConflictStrategy;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
@@ -27,10 +26,6 @@ public interface SimpleTbEntityService<T> {
 
     T save(T entity, SecurityUser user) throws Exception;
 
-    default T save(T entity, NameConflictStrategy nameConflictPolicy, SecurityUser user) throws Exception {
-        return save(entity, null);
-    }
-
     void delete(T entity, User user);
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/customer/TbCustomerService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/customer/TbCustomerService.java
index f77e990620..5884ae2e48 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/customer/TbCustomerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/customer/TbCustomerService.java
@@ -16,8 +16,12 @@
 package org.thingsboard.server.service.entitiy.customer;
 
 import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.NameConflictStrategy;
 import org.thingsboard.server.service.entitiy.SimpleTbEntityService;
+import org.thingsboard.server.service.security.model.SecurityUser;
 
 public interface TbCustomerService extends SimpleTbEntityService<Customer> {
 
+    Customer save(Customer customer, NameConflictStrategy nameConflictStrategy, SecurityUser user) throws Exception;
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
index 85d5de5379..e982adbdf1 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
@@ -55,6 +55,11 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
     private final DeviceCredentialsService deviceCredentialsService;
     private final ClaimDevicesService claimDevicesService;
 
+    @Override
+    public Device save(Device device, String accessToken, User user) throws Exception {
+        return save(device, accessToken, NameConflictStrategy.DEFAULT, user);
+    }
+
     @Override
     public Device save(Device device, String accessToken, NameConflictStrategy nameConflictStrategy, User user) throws Exception {
         ActionType actionType = device.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
@@ -72,6 +77,11 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         }
     }
 
+    @Override
+    public Device saveDeviceWithCredentials(Device device, DeviceCredentials credentials, User user) throws ThingsboardException {
+        return saveDeviceWithCredentials(device, credentials, NameConflictStrategy.DEFAULT, user);
+    }
+
     @Override
     public Device saveDeviceWithCredentials(Device device, DeviceCredentials credentials, NameConflictStrategy nameConflictStrategy, User user) throws ThingsboardException {
         ActionType actionType = device.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/device/TbDeviceService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/device/TbDeviceService.java
index 26be8c5db4..e217d8de7b 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/device/TbDeviceService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/device/TbDeviceService.java
@@ -32,8 +32,12 @@ import org.thingsboard.server.dao.device.claim.ReclaimResult;
 
 public interface TbDeviceService {
 
+    Device save(Device device, String accessToken, User user) throws Exception;
+
     Device save(Device device, String accessToken, NameConflictStrategy nameConflictStrategy, User user) throws Exception;
 
+    Device saveDeviceWithCredentials(Device device, DeviceCredentials deviceCredentials, User user) throws ThingsboardException;
+
     Device saveDeviceWithCredentials(Device device, DeviceCredentials deviceCredentials, NameConflictStrategy nameConflictStrategy, User user) throws ThingsboardException;
 
     void delete(Device device, User user);
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java
index 4daf54afdd..54699e0995 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java
@@ -79,6 +79,11 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
 
     final Map<TenantId, Map<EntityId, List<EntityView>>> localCache = new ConcurrentHashMap<>();
 
+    @Override
+    public EntityView save(EntityView entityView, EntityView existingEntityView, User user) throws Exception {
+        return save(entityView, existingEntityView, NameConflictStrategy.DEFAULT, user);
+    }
+
     @Override
     public EntityView save(EntityView entityView, EntityView existingEntityView, NameConflictStrategy nameConflictStrategy, User user) throws Exception {
         ActionType actionType = entityView.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/TbEntityViewService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/TbEntityViewService.java
index f34b4ed335..bb4bcf9cad 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/TbEntityViewService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/entityview/TbEntityViewService.java
@@ -32,6 +32,8 @@ import java.util.List;
 
 public interface TbEntityViewService extends ComponentLifecycleListener {
 
+    EntityView save(EntityView entityView, EntityView existingEntityView, User user) throws Exception;
+
     EntityView save(EntityView entityView, EntityView existingEntityView, NameConflictStrategy nameConflictStrategy, User user) throws Exception;
 
     void updateEntityViewAttributes(TenantId tenantId, EntityView savedEntityView, EntityView oldEntityView, User user) throws ThingsboardException;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java
index 7735e718c8..098dc4e83d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java
@@ -16,7 +16,6 @@
 package org.thingsboard.server.dao.asset;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import org.thingsboard.server.common.data.EntityInfo;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.ProfileEntityIdInfo;
 import org.thingsboard.server.common.data.asset.Asset;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
index feeac3e336..6bc8903d20 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
@@ -21,7 +21,6 @@ import org.thingsboard.server.common.data.DeviceIdInfo;
 import org.thingsboard.server.common.data.DeviceInfo;
 import org.thingsboard.server.common.data.DeviceInfoFilter;
 import org.thingsboard.server.common.data.DeviceTransportType;
-import org.thingsboard.server.common.data.EntityInfo;
 import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.ProfileEntityIdInfo;
 import org.thingsboard.server.common.data.id.DeviceId;