diff --git a/hazelcast/src/main/java/com/hazelcast/internal/server/tcp/TcpServerContext.java b/hazelcast/src/main/java/com/hazelcast/internal/server/tcp/TcpServerContext.java
index 13f9208b59a7d..ab23ab1522651 100644
--- a/hazelcast/src/main/java/com/hazelcast/internal/server/tcp/TcpServerContext.java
+++ b/hazelcast/src/main/java/com/hazelcast/internal/server/tcp/TcpServerContext.java
@@ -42,7 +42,7 @@
 import com.hazelcast.internal.util.AddressUtil;
 import com.hazelcast.logging.LoggingService;
 import com.hazelcast.nio.MemberSocketInterceptor;
-import com.hazelcast.spi.impl.NodeEngineImpl;
+import com.hazelcast.spi.impl.NodeEngine;
 import com.hazelcast.spi.impl.eventservice.EventService;
 import com.hazelcast.spi.impl.executionservice.ExecutionService;
 import com.hazelcast.spi.properties.ClusterProperty;
@@ -66,11 +66,11 @@
 public class TcpServerContext implements ServerContext {
 
     private final Node node;
-    private final NodeEngineImpl nodeEngine;
+    private final NodeEngine nodeEngine;
     private final RestApiConfig restApiConfig;
     private final MemcacheProtocolConfig memcacheProtocolConfig;
 
-    public TcpServerContext(Node node, NodeEngineImpl nodeEngine) {
+    public TcpServerContext(Node node, NodeEngine nodeEngine) {
         this.node = node;
         this.nodeEngine = nodeEngine;
         this.restApiConfig = initRestApiConfig(node.getConfig());
@@ -140,6 +140,7 @@ public Map<EndpointQualifier, Address> getThisAddresses() {
     public void onFatalError(Exception e) {
         String hzName = nodeEngine.getHazelcastInstance().getName();
         Thread thread = new Thread(createThreadName(hzName, "io.error.shutdown")) {
+            @Override
             public void run() {
                 node.shutdown(false);
             }
diff --git a/hazelcast/src/main/java/com/hazelcast/jet/impl/execution/TaskletExecutionService.java b/hazelcast/src/main/java/com/hazelcast/jet/impl/execution/TaskletExecutionService.java
index 11c0af51533ad..b8d0c0439c966 100644
--- a/hazelcast/src/main/java/com/hazelcast/jet/impl/execution/TaskletExecutionService.java
+++ b/hazelcast/src/main/java/com/hazelcast/jet/impl/execution/TaskletExecutionService.java
@@ -33,7 +33,7 @@
 import com.hazelcast.jet.impl.util.ProgressTracker;
 import com.hazelcast.jet.impl.util.Util;
 import com.hazelcast.logging.ILogger;
-import com.hazelcast.spi.impl.NodeEngineImpl;
+import com.hazelcast.spi.impl.NodeEngine;
 import com.hazelcast.spi.impl.executionservice.ExecutionService;
 import com.hazelcast.spi.properties.HazelcastProperties;
 import com.hazelcast.spi.properties.HazelcastProperty;
@@ -94,7 +94,7 @@ public class TaskletExecutionService {
     private final IdleStrategy idlerCooperative;
     private final IdleStrategy idlerNonCooperative;
 
-    public TaskletExecutionService(NodeEngineImpl nodeEngine, int threadCount, HazelcastProperties properties) {
+    public TaskletExecutionService(NodeEngine nodeEngine, int threadCount, HazelcastProperties properties) {
         hzExecutionService = nodeEngine.getExecutionService();
         hzExecutionService.register(TASKLET_INIT_CLOSE_EXECUTOR_NAME,
                 RuntimeAvailableProcessors.get(), Integer.MAX_VALUE, CACHED);
diff --git a/hazelcast/src/test/java/com/hazelcast/internal/server/tcp/TcpServerContextTest.java b/hazelcast/src/test/java/com/hazelcast/internal/server/tcp/TcpServerContextTest.java
index deee37b12991d..4f7bcabcd488e 100644
--- a/hazelcast/src/test/java/com/hazelcast/internal/server/tcp/TcpServerContextTest.java
+++ b/hazelcast/src/test/java/com/hazelcast/internal/server/tcp/TcpServerContextTest.java
@@ -19,7 +19,7 @@
 import com.hazelcast.config.Config;
 import com.hazelcast.config.NetworkConfig;
 import com.hazelcast.instance.impl.Node;
-import com.hazelcast.spi.impl.NodeEngineImpl;
+import com.hazelcast.spi.impl.NodeEngine;
 import com.hazelcast.spi.properties.HazelcastProperties;
 import com.hazelcast.test.HazelcastParallelClassRunner;
 import com.hazelcast.test.HazelcastTestSupport;
@@ -48,7 +48,7 @@ public class TcpServerContextTest extends HazelcastTestSupport {
     @Before
     public void setUp() {
         Node mockNode = mock(Node.class);
-        NodeEngineImpl mockNodeEngine = mock(NodeEngineImpl.class);
+        NodeEngine mockNodeEngine = mock(NodeEngine.class);
         Config config = new Config();
         HazelcastProperties properties = new HazelcastProperties(config);
         networkConfig = config.getNetworkConfig();
diff --git a/hazelcast/src/test/java/com/hazelcast/internal/util/CollectionTxnUtilTest.java b/hazelcast/src/test/java/com/hazelcast/internal/util/CollectionTxnUtilTest.java
index dce9ff68c961b..69c1bf70aafc2 100644
--- a/hazelcast/src/test/java/com/hazelcast/internal/util/CollectionTxnUtilTest.java
+++ b/hazelcast/src/test/java/com/hazelcast/internal/util/CollectionTxnUtilTest.java
@@ -26,7 +26,7 @@
 import com.hazelcast.spi.impl.operationservice.BackupAwareOperation;
 import com.hazelcast.spi.impl.operationservice.Operation;
 import com.hazelcast.internal.services.RemoteService;
-import com.hazelcast.spi.impl.NodeEngineImpl;
+import com.hazelcast.spi.impl.NodeEngine;
 import com.hazelcast.test.HazelcastParallelClassRunner;
 import com.hazelcast.test.HazelcastTestSupport;
 import com.hazelcast.test.annotation.ParallelJVMTest;
@@ -50,7 +50,7 @@
 @Category({QuickTest.class, ParallelJVMTest.class})
 public class CollectionTxnUtilTest extends HazelcastTestSupport {
 
-    private NodeEngineImpl nodeEngine = mock(NodeEngineImpl.class);
+    private NodeEngine nodeEngine = mock(NodeEngine.class);
 
     private RemoteService remoteService = mock(RemoteService.class);
 
diff --git a/hazelcast/src/test/java/com/hazelcast/jet/impl/execution/TaskletExecutionServiceTest.java b/hazelcast/src/test/java/com/hazelcast/jet/impl/execution/TaskletExecutionServiceTest.java
index 5147270ba6cd7..c785782a0ebb4 100644
--- a/hazelcast/src/test/java/com/hazelcast/jet/impl/execution/TaskletExecutionServiceTest.java
+++ b/hazelcast/src/test/java/com/hazelcast/jet/impl/execution/TaskletExecutionServiceTest.java
@@ -25,7 +25,7 @@
 import com.hazelcast.logging.ILogger;
 import com.hazelcast.logging.Logger;
 import com.hazelcast.logging.LoggingService;
-import com.hazelcast.spi.impl.NodeEngineImpl;
+import com.hazelcast.spi.impl.NodeEngine;
 import com.hazelcast.spi.impl.executionservice.ExecutionService;
 import com.hazelcast.spi.properties.HazelcastProperties;
 import com.hazelcast.test.HazelcastParallelClassRunner;
@@ -85,7 +85,7 @@ public class TaskletExecutionServiceTest extends JetTestSupport {
     @Before
     public void before() {
         executor = Executors.newCachedThreadPool();
-        NodeEngineImpl neMock = mock(NodeEngineImpl.class);
+        NodeEngine neMock = mock(NodeEngine.class);
 
         HazelcastInstance hzMock = mock(HazelcastInstance.class);
         when(neMock.getHazelcastInstance()).thenReturn(hzMock);
diff --git a/hazelcast/src/test/java/com/hazelcast/test/starter/answer/NodeAnswer.java b/hazelcast/src/test/java/com/hazelcast/test/starter/answer/NodeAnswer.java
index 817bdb224c6fc..a28c467248017 100644
--- a/hazelcast/src/test/java/com/hazelcast/test/starter/answer/NodeAnswer.java
+++ b/hazelcast/src/test/java/com/hazelcast/test/starter/answer/NodeAnswer.java
@@ -19,7 +19,7 @@
 import com.hazelcast.instance.impl.Node;
 import com.hazelcast.internal.cluster.impl.ClusterServiceImpl;
 import com.hazelcast.internal.partition.InternalPartitionService;
-import com.hazelcast.spi.impl.NodeEngineImpl;
+import com.hazelcast.spi.impl.NodeEngine;
 import org.mockito.invocation.InvocationOnMock;
 
 import static com.hazelcast.test.starter.HazelcastProxyFactory.proxyArgumentsIfNeeded;
@@ -53,7 +53,7 @@ Object answer(InvocationOnMock invocation, String methodName, Object[] arguments
             return mock(InternalPartitionService.class, new PartitionServiceAnswer(partitionService));
         } else if (arguments.length == 0 && methodName.equals("getNodeEngine")) {
             Object nodeEngine = invokeForMock(invocation);
-            return mock(NodeEngineImpl.class, new NodeEngineAnswer(nodeEngine));
+            return mock(NodeEngine.class, new NodeEngineAnswer(nodeEngine));
         } else if (arguments.length == 1 && methodName.equals("getConnectionManager")) {
             arguments = proxyArgumentsIfNeeded(arguments, delegateClassloader);
             Object endpointManager = invokeForMock(invocation, arguments);