diff --git a/application/src/main/java/org/thingsboard/server/controller/RpcController.java b/application/src/main/java/org/thingsboard/server/controller/RpcController.java
index 9810c031b6..3ca73f6c96 100644
--- a/application/src/main/java/org/thingsboard/server/controller/RpcController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/RpcController.java
@@ -41,7 +41,7 @@ import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity;
 import org.thingsboard.server.extensions.api.plugins.PluginConstants;
 import org.thingsboard.server.common.data.rpc.RpcRequest;
 import org.thingsboard.server.service.rpc.LocalRequestMetaData;
-import org.thingsboard.server.service.rpc.RpcService;
+import org.thingsboard.server.service.rpc.DeviceRpcService;
 import org.thingsboard.server.service.security.AccessValidator;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
@@ -66,7 +66,7 @@ public class RpcController extends BaseController {
     protected final ObjectMapper jsonMapper = new ObjectMapper();
 
     @Autowired
-    private RpcService rpcService;
+    private DeviceRpcService deviceRpcService;
 
     @Autowired
     private AccessValidator accessValidator;
@@ -124,7 +124,7 @@ public class RpcController extends BaseController {
                             timeout,
                             body
                     );
-                    rpcService.process(rpcRequest, new LocalRequestMetaData(rpcRequest, currentUser, response));
+                    deviceRpcService.process(rpcRequest, new LocalRequestMetaData(rpcRequest, currentUser, response));
                 }
 
                 @Override
@@ -135,7 +135,7 @@ public class RpcController extends BaseController {
                     } else {
                         entity = new ResponseEntity(HttpStatus.UNAUTHORIZED);
                     }
-                    rpcService.logRpcCall(currentUser, deviceId, body, oneWay, Optional.empty(), e);
+                    deviceRpcService.logRpcCall(currentUser, deviceId, body, oneWay, Optional.empty(), e);
                     response.setResult(entity);
                 }
             });
diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java
similarity index 98%
rename from application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java
rename to application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java
index f81de99ece..c394a57783 100644
--- a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.service.rpc;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -34,7 +33,6 @@ import org.thingsboard.server.common.msg.cluster.ServerAddress;
 import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.audit.AuditLogService;
-import org.thingsboard.server.extensions.api.plugins.PluginContext;
 import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse;
 import org.thingsboard.server.extensions.api.plugins.msg.RpcError;
 import org.thingsboard.server.service.cluster.routing.ClusterRoutingService;
@@ -58,7 +56,7 @@ import java.util.function.BiConsumer;
  */
 @Service
 @Slf4j
-public class DefaultRpcService implements RpcService {
+public class DefaultDeviceRpcService implements DeviceRpcService {
 
     private static final ObjectMapper jsonMapper = new ObjectMapper();
 
diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java
similarity index 97%
rename from application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java
rename to application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java
index 2f6c2b168d..bf585a43a4 100644
--- a/application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java
@@ -27,7 +27,7 @@ import java.util.Optional;
 /**
  * Created by ashvayka on 16.04.18.
  */
-public interface RpcService {
+public interface DeviceRpcService {
 
     void process(ToDeviceRpcRequest request, LocalRequestMetaData metaData);
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java
index 0549e6af23..a242093efc 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java
@@ -1,12 +1,12 @@
 /**
  * Copyright © 2016-2018 The Thingsboard Authors
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.