diff --git a/src/tools/clangrefactoringbackend/source/storagesqlitestatementfactory.h b/src/tools/clangrefactoringbackend/source/storagesqlitestatementfactory.h
index f428e142afb..4109fb05110 100644
--- a/src/tools/clangrefactoringbackend/source/storagesqlitestatementfactory.h
+++ b/src/tools/clangrefactoringbackend/source/storagesqlitestatementfactory.h
@@ -142,27 +142,27 @@ public:
         "DELETE FROM newLocations",
         database
     };
-    WriteStatement insertProjectPart{
+    WriteStatement insertProjectPartStatement{
         "INSERT OR IGNORE INTO projectParts(projectPartName, compilerArguments) VALUES (?,?)",
         database
     };
-    WriteStatement updateProjectPart{
+    WriteStatement updateProjectPartStatement{
         "UPDATE projectParts SET compilerArguments = ? WHERE projectPartName = ?",
         database
     };
-    ReadStatement getProjectPartId{
+    ReadStatement getProjectPartIdStatement{
         "SELECT projectPartId FROM projectParts WHERE projectPartName = ?",
         database
     };
-    WriteStatement deleteAllProjectPartsSourcesWithProjectPartId{
+    WriteStatement deleteAllProjectPartsSourcesWithProjectPartIdStatement{
         "DELETE FROM projectPartsSources WHERE projectPartId = ?",
         database
     };
-    WriteStatement insertProjectPartSources{
+    WriteStatement insertProjectPartSourcesStatement{
         "INSERT INTO projectPartsSources(projectPartId, sourceId) VALUES (?,?)",
         database
     };
-   ReadStatement getCompileArgumentsForFileId{
+   ReadStatement getCompileArgumentsForFileIdStatement{
         "SELECT compilerArguments FROM projectParts WHERE projectPartId = (SELECT projectPartId FROM projectPartsSources WHERE sourceId = ?)",
         database
     };
diff --git a/src/tools/clangrefactoringbackend/source/symbolstorage.h b/src/tools/clangrefactoringbackend/source/symbolstorage.h
index 9cdeedf964c..2a86746cde3 100644
--- a/src/tools/clangrefactoringbackend/source/symbolstorage.h
+++ b/src/tools/clangrefactoringbackend/source/symbolstorage.h
@@ -72,11 +72,11 @@ public:
 
         Utils::SmallString compilerArguementsAsJson = toJson(commandLineArguments);
 
-        WriteStatement &insertStatement = m_statementFactory.insertProjectPart;
+        WriteStatement &insertStatement = m_statementFactory.insertProjectPartStatement;
         insertStatement.write(projectPartName, compilerArguementsAsJson);
 
         if (m_statementFactory.database.lastInsertedRowId() == -1) {
-            WriteStatement &updateStatement = m_statementFactory.updateProjectPart;
+            WriteStatement &updateStatement = m_statementFactory.updateProjectPartStatement;
             updateStatement.write(compilerArguementsAsJson, projectPartName);
         }
     }
@@ -95,13 +95,13 @@ public:
     void updateProjectPartSources(Utils::SmallStringView projectPartName,
                                   const FilePathIds &sourceFilePathIds) override
     {
-        ReadStatement &getProjectPartIdStatement = m_statementFactory.getProjectPartId;
+        ReadStatement &getProjectPartIdStatement = m_statementFactory.getProjectPartIdStatement;
         int projectPartId = getProjectPartIdStatement.template value<int>(projectPartName).value();
 
-        WriteStatement &deleteStatement = m_statementFactory.deleteAllProjectPartsSourcesWithProjectPartId;
+        WriteStatement &deleteStatement = m_statementFactory.deleteAllProjectPartsSourcesWithProjectPartIdStatement;
         deleteStatement.write(projectPartId);
 
-        WriteStatement &insertStatement = m_statementFactory.insertProjectPartSources;
+        WriteStatement &insertStatement = m_statementFactory.insertProjectPartSourcesStatement;
         for (const FilePathId &sourceFilePathId : sourceFilePathIds)
             insertStatement.write(projectPartId, sourceFilePathId.filePathId);
     }
diff --git a/tests/unit/unittest/storagesqlitestatementfactory-test.cpp b/tests/unit/unittest/storagesqlitestatementfactory-test.cpp
index ff82e537dfa..8c5193aaab4 100644
--- a/tests/unit/unittest/storagesqlitestatementfactory-test.cpp
+++ b/tests/unit/unittest/storagesqlitestatementfactory-test.cpp
@@ -156,37 +156,37 @@ TEST_F(StorageSqliteStatementFactory, DeleteNewLocationsTableStatement)
 
 TEST_F(StorageSqliteStatementFactory, InsertProjectPart)
 {
-    ASSERT_THAT(factory.insertProjectPart.sqlStatement,
+    ASSERT_THAT(factory.insertProjectPartStatement.sqlStatement,
                 Eq("INSERT OR IGNORE INTO projectParts(projectPartName, compilerArguments) VALUES (?,?)"));
 }
 
 TEST_F(StorageSqliteStatementFactory, UpdateProjectPart)
 {
-    ASSERT_THAT(factory.updateProjectPart.sqlStatement,
+    ASSERT_THAT(factory.updateProjectPartStatement.sqlStatement,
                 Eq("UPDATE projectParts SET compilerArguments = ? WHERE projectPartName = ?"));
 }
 
 TEST_F(StorageSqliteStatementFactory, GetProjectPartIdForProjectPartName)
 {
-    ASSERT_THAT(factory.getProjectPartId.sqlStatement,
+    ASSERT_THAT(factory.getProjectPartIdStatement.sqlStatement,
                 Eq("SELECT projectPartId FROM projectParts WHERE projectPartName = ?"));
 }
 
 TEST_F(StorageSqliteStatementFactory, DeleteAllProjectPartsSourcesWithProjectPartId)
 {
-    ASSERT_THAT(factory.deleteAllProjectPartsSourcesWithProjectPartId.sqlStatement,
+    ASSERT_THAT(factory.deleteAllProjectPartsSourcesWithProjectPartIdStatement.sqlStatement,
                 Eq("DELETE FROM projectPartsSources WHERE projectPartId = ?"));
 }
 
 TEST_F(StorageSqliteStatementFactory, InsertProjectPartsSources)
 {
-    ASSERT_THAT(factory.insertProjectPartSources.sqlStatement,
+    ASSERT_THAT(factory.insertProjectPartSourcesStatement.sqlStatement,
                 Eq("INSERT INTO projectPartsSources(projectPartId, sourceId) VALUES (?,?)"));
 }
 
 TEST_F(StorageSqliteStatementFactory, GetCompileArgumentsForFileId)
 {
-    ASSERT_THAT(factory.getCompileArgumentsForFileId.sqlStatement,
+    ASSERT_THAT(factory.getCompileArgumentsForFileIdStatement.sqlStatement,
                 Eq("SELECT compilerArguments FROM projectParts WHERE projectPartId = (SELECT projectPartId FROM projectPartsSources WHERE sourceId = ?)"));
 }
 
diff --git a/tests/unit/unittest/symbolstorage-test.cpp b/tests/unit/unittest/symbolstorage-test.cpp
index 37766f4953c..5239938ec6b 100644
--- a/tests/unit/unittest/symbolstorage-test.cpp
+++ b/tests/unit/unittest/symbolstorage-test.cpp
@@ -69,11 +69,11 @@ protected:
     MockSqliteWriteStatement &insertNewLocationsInLocationsStatement = statementFactory.insertNewLocationsInLocationsStatement;
     MockSqliteWriteStatement &deleteNewSymbolsTableStatement = statementFactory.deleteNewSymbolsTableStatement;
     MockSqliteWriteStatement &deleteNewLocationsTableStatement = statementFactory.deleteNewLocationsTableStatement;
-    MockSqliteWriteStatement &insertProjectPart = statementFactory.insertProjectPart;
-    MockSqliteWriteStatement &updateProjectPart = statementFactory.updateProjectPart;
-    MockSqliteReadStatement &getProjectPartId = statementFactory.getProjectPartId;
-    MockSqliteWriteStatement &deleteAllProjectPartsSourcesWithProjectPartId = statementFactory.deleteAllProjectPartsSourcesWithProjectPartId;
-    MockSqliteWriteStatement &insertProjectPartSources = statementFactory.insertProjectPartSources;
+    MockSqliteWriteStatement &insertProjectPartStatement = statementFactory.insertProjectPartStatement;
+    MockSqliteWriteStatement &updateProjectPartStatement = statementFactory.updateProjectPartStatement;
+    MockSqliteReadStatement &getProjectPartIdStatement = statementFactory.getProjectPartIdStatement;
+    MockSqliteWriteStatement &deleteAllProjectPartsSourcesWithProjectPartIdStatement = statementFactory.deleteAllProjectPartsSourcesWithProjectPartIdStatement;
+    MockSqliteWriteStatement &insertProjectPartSourcesStatement = statementFactory.insertProjectPartSourcesStatement;
     MockSqliteWriteStatement &insertIntoNewUsedDefinesStatement = statementFactory.insertIntoNewUsedDefinesStatement;
     MockSqliteWriteStatement &syncNewUsedDefinesStatement = statementFactory.syncNewUsedDefinesStatement;
     MockSqliteWriteStatement &deleteOutdatedUsedDefinesStatement = statementFactory.deleteOutdatedUsedDefinesStatement;
@@ -177,7 +177,7 @@ TEST_F(SymbolStorage, InsertProjectPart)
     ON_CALL(mockDatabase, lastInsertedRowId()).WillByDefault(Return(1));
 
     EXPECT_CALL(mockDatabase, setLastInsertedRowId(-1));
-    EXPECT_CALL(insertProjectPart, write(TypedEq<Utils::SmallStringView>("project"), TypedEq<Utils::SmallStringView>("[\"foo\"]")));
+    EXPECT_CALL(insertProjectPartStatement, write(TypedEq<Utils::SmallStringView>("project"), TypedEq<Utils::SmallStringView>("[\"foo\"]")));
     EXPECT_CALL(mockDatabase, lastInsertedRowId());
 
     storage.insertOrUpdateProjectPart("project",  {"foo"});
@@ -189,9 +189,9 @@ TEST_F(SymbolStorage, UpdateProjectPart)
     ON_CALL(mockDatabase, lastInsertedRowId()).WillByDefault(Return(-1));
 
     EXPECT_CALL(mockDatabase, setLastInsertedRowId(-1));
-    EXPECT_CALL(insertProjectPart, write(TypedEq<Utils::SmallStringView>("project"), TypedEq<Utils::SmallStringView>("[\"foo\"]")));
+    EXPECT_CALL(insertProjectPartStatement, write(TypedEq<Utils::SmallStringView>("project"), TypedEq<Utils::SmallStringView>("[\"foo\"]")));
     EXPECT_CALL(mockDatabase, lastInsertedRowId());
-    EXPECT_CALL(updateProjectPart, write(TypedEq<Utils::SmallStringView>("[\"foo\"]"), TypedEq<Utils::SmallStringView>("project")));
+    EXPECT_CALL(updateProjectPartStatement, write(TypedEq<Utils::SmallStringView>("[\"foo\"]"), TypedEq<Utils::SmallStringView>("project")));
 
     storage.insertOrUpdateProjectPart("project",  {"foo"});
 }
@@ -200,10 +200,10 @@ TEST_F(SymbolStorage, UpdateProjectPartSources)
 {
     InSequence sequence;
 
-    EXPECT_CALL(getProjectPartId, valueReturnInt32(TypedEq<Utils::SmallStringView>("project"))).WillRepeatedly(Return(42));
-    EXPECT_CALL(deleteAllProjectPartsSourcesWithProjectPartId, write(TypedEq<int>(42)));
-    EXPECT_CALL(insertProjectPartSources, write(TypedEq<int>(42), TypedEq<int>(1)));
-    EXPECT_CALL(insertProjectPartSources, write(TypedEq<int>(42), TypedEq<int>(2)));
+    EXPECT_CALL(getProjectPartIdStatement, valueReturnInt32(TypedEq<Utils::SmallStringView>("project"))).WillRepeatedly(Return(42));
+    EXPECT_CALL(deleteAllProjectPartsSourcesWithProjectPartIdStatement, write(TypedEq<int>(42)));
+    EXPECT_CALL(insertProjectPartSourcesStatement, write(TypedEq<int>(42), TypedEq<int>(1)));
+    EXPECT_CALL(insertProjectPartSourcesStatement, write(TypedEq<int>(42), TypedEq<int>(2)));
 
     storage.updateProjectPartSources("project", {{1, 1}, {1, 2}});
 }