diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index 553798283e60a..5d0e6bd7ffd8d 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -16,7 +16,7 @@ context,ctx
 contexts,ctxs
 count,cnt
 current,cur
-#database,db
+database,db
 #default,dflt
 #destination,dest
 #directory,dir
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/CheckCpHistTask.java b/modules/core/src/main/java/org/apache/ignite/internal/CheckCpHistTask.java
index 2b8cb062668f7..4cf535bdc4887 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/CheckCpHistTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/CheckCpHistTask.java
@@ -132,8 +132,8 @@ public CheckCpHistClosureJob(Map<Integer, Set<Integer>> grpIds) {
 
             if (igniteEx.context().cache().context().database() instanceof GridCacheDatabaseSharedManager) {
                 GridCacheSharedContext cctx = igniteEx.context().cache().context();
-                GridCacheDatabaseSharedManager databaseMng = (GridCacheDatabaseSharedManager)cctx.database();
-                CheckpointHistory cpHist = databaseMng.checkpointHistory();
+                GridCacheDatabaseSharedManager dbMng = (GridCacheDatabaseSharedManager)cctx.database();
+                CheckpointHistory cpHist = dbMng.checkpointHistory();
 
                 CheckpointEntry lastCp = cpHist.lastCheckpoint();
 
@@ -145,7 +145,7 @@ public CheckCpHistClosureJob(Map<Integer, Set<Integer>> grpIds) {
                             return false;
 
                         if (!cpHist.isCheckpointApplicableForGroup(grpId, lastCp)) {
-                            databaseMng.forceCheckpoint(CP_REASON);
+                            dbMng.forceCheckpoint(CP_REASON);
 
                             break;
                         }
@@ -154,7 +154,7 @@ public CheckCpHistClosureJob(Map<Integer, Set<Integer>> grpIds) {
 
                         for (int p : grpIds.get(grpId)) {
                             if (groupState.indexByPartition(p) < 0) {
-                                databaseMng.forceCheckpoint(CP_REASON);
+                                dbMng.forceCheckpoint(CP_REASON);
 
                                 break;
                             }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index af8f92fb8a858..90d7e7a211ce2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -189,9 +189,9 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
 
         RootPage reuseListRoot = metas.reuseListRoot;
 
-        GridCacheDatabaseSharedManager databaseSharedManager = (GridCacheDatabaseSharedManager)ctx.database();
+        GridCacheDatabaseSharedManager dbSharedManager = (GridCacheDatabaseSharedManager)ctx.database();
 
-        pageListCacheLimit = databaseSharedManager.pageListCacheLimitHolder(grp.dataRegion());
+        pageListCacheLimit = dbSharedManager.pageListCacheLimitHolder(grp.dataRegion());
 
         reuseList = new ReuseListImpl(
             grp.groupId(),
@@ -224,7 +224,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
             ctx.diagnostic().pageLockTracker()
         );
 
-        databaseSharedManager.addCheckpointListener(this, grp.dataRegion());
+        dbSharedManager.addCheckpointListener(this, grp.dataRegion());
     }
 
     /**
@@ -1057,7 +1057,7 @@ private Metas getOrAllocateCacheMetas() throws IgniteCheckedException {
         if (partCntrs == null || partCntrs.isEmpty())
             return null;
 
-        GridCacheDatabaseSharedManager database = (GridCacheDatabaseSharedManager)grp.shared().database();
+        GridCacheDatabaseSharedManager db = (GridCacheDatabaseSharedManager)grp.shared().database();
 
         Map<Integer, Long> partsCounters = new HashMap<>();
 
@@ -1069,10 +1069,10 @@ private Metas getOrAllocateCacheMetas() throws IgniteCheckedException {
         }
 
         try {
-            WALPointer minPtr = database.checkpointHistory().searchEarliestWalPointer(grp.groupId(),
+            WALPointer minPtr = db.checkpointHistory().searchEarliestWalPointer(grp.groupId(),
                 partsCounters, grp.hasAtomicCaches() ? walAtomicCacheMargin : 0L);
 
-            WALPointer latestReservedPointer = database.latestWalPointerReservedForPreloading();
+            WALPointer latestReservedPointer = db.latestWalPointerReservedForPreloading();
 
             assert latestReservedPointer == null || latestReservedPointer.compareTo(minPtr) <= 0
                 : "Historical iterator tries to iterate WAL out of reservation [cache=" + grp.cacheOrGroupName()