diff --git a/tools/projmgr/include/ProjMgrYamlParser.h b/tools/projmgr/include/ProjMgrYamlParser.h
index eb074ede6..782b98da6 100644
--- a/tools/projmgr/include/ProjMgrYamlParser.h
+++ b/tools/projmgr/include/ProjMgrYamlParser.h
@@ -14,6 +14,7 @@
   * @brief YAML key definitions
 */
 static constexpr const char* YAML_ADDPATHS = "add-paths";
+static constexpr const char* YAML_ADDPATH = "add-path";
 static constexpr const char* YAML_BOARD = "board";
 static constexpr const char* YAML_BUILDTYPES = "build-types";
 static constexpr const char* YAML_CATEGORY = "category";
@@ -24,7 +25,9 @@ static constexpr const char* YAML_COMPONENTS = "components";
 static constexpr const char* YAML_DEBUG = "debug";
 static constexpr const char* YAML_DEFAULT = "default";
 static constexpr const char* YAML_DEFINES = "defines";
+static constexpr const char* YAML_DEFINE = "define";
 static constexpr const char* YAML_DELPATHS = "del-paths";
+static constexpr const char* YAML_DELPATH = "del-path";
 static constexpr const char* YAML_DESCRIPTION = "description";
 static constexpr const char* YAML_DEVICE = "device";
 static constexpr const char* YAML_ENDIAN = "endian";
@@ -67,6 +70,7 @@ static constexpr const char* YAML_TARGETTYPES = "target-types";
 static constexpr const char* YAML_TRUSTZONE = "trustzone";
 static constexpr const char* YAML_TYPE = "type";
 static constexpr const char* YAML_UNDEFINES = "undefines";
+static constexpr const char* YAML_UNDEFINE = "undefine";
 static constexpr const char* YAML_WARNINGS = "warnings";
 
 /**
diff --git a/tools/projmgr/schemas/common.schema.json b/tools/projmgr/schemas/common.schema.json
index 19c0d5601..e06f52fa4 100644
--- a/tools/projmgr/schemas/common.schema.json
+++ b/tools/projmgr/schemas/common.schema.json
@@ -109,10 +109,7 @@
       "description": "List of #define symbol settings for the code generation.",
       "uniqueItems": true,
       "minItems": 1,
-      "prefixItems": [
-        { "type": "string" },
-        { "type": "object", "patternProperties": { "^(.*)$": { "type": "string" } } }
-      ]
+      "items": { "type": "string" }
     },
     "UndefinesType": {
       "type": "array",
@@ -174,9 +171,13 @@
         "optimize":   { "$ref": "#/definitions/OptimizeType" },
         "debug":      { "$ref": "#/definitions/DebugType" },
         "defines":    { "$ref": "#/definitions/DefinesType" },
+        "define":     { "$ref": "#/definitions/DefinesType" },
         "undefines":  { "$ref": "#/definitions/UndefinesType" },
+        "undefine":   { "$ref": "#/definitions/UndefinesType" },
         "add-paths":  { "$ref": "#/definitions/AddpathsType" },
+        "add-path":   { "$ref": "#/definitions/AddpathsType" },
         "del-paths":  { "$ref": "#/definitions/DelpathsType" },
+        "del-path":   { "$ref": "#/definitions/DelpathsType" },
         "misc":       { "$ref": "#/definitions/MiscTypes" }
       },
       "additionalProperties": false,
@@ -201,9 +202,13 @@
         "optimize":   { "$ref": "#/definitions/OptimizeType" },
         "debug":      { "$ref": "#/definitions/DebugType" },
         "defines":    { "$ref": "#/definitions/DefinesType" },
+        "define":     { "$ref": "#/definitions/DefinesType" },
         "undefines":  { "$ref": "#/definitions/UndefinesType" },
+        "undefine":   { "$ref": "#/definitions/UndefinesType" },
         "add-paths":  { "$ref": "#/definitions/AddpathsType" },
+        "add-path":   { "$ref": "#/definitions/AddpathsType" },
         "del-paths":  { "$ref": "#/definitions/DelpathsType" },
+        "del-path":   { "$ref": "#/definitions/DelpathsType" },
         "misc":       { "$ref": "#/definitions/MiscTypes" }
       },
       "additionalProperties": false,
@@ -265,9 +270,13 @@
         "optimize":     { "$ref": "#/definitions/OptimizeType" },
         "debug":        { "$ref": "#/definitions/DebugType" },
         "defines":      { "$ref": "#/definitions/DefinesType" },
+        "define":       { "$ref": "#/definitions/DefinesType" },
         "undefines":    { "$ref": "#/definitions/UndefinesType" },
+        "undefine":     { "$ref": "#/definitions/UndefinesType" },
         "add-paths":    { "$ref": "#/definitions/AddpathsType" },
+        "add-path":     { "$ref": "#/definitions/AddpathsType" },
         "del-paths":    { "$ref": "#/definitions/DelpathsType" },
+        "del-path":     { "$ref": "#/definitions/DelpathsType" },
         "misc":         { "$ref": "#/definitions/MiscTypes" },
         "groups":       { "$ref": "#/definitions/GroupsType" },
         "files":        { "$ref": "#/definitions/FilesType" }
@@ -295,9 +304,13 @@
         "optimize":     { "$ref": "#/definitions/OptimizeType" },
         "debug":        { "$ref": "#/definitions/DebugType" },
         "defines":      { "$ref": "#/definitions/DefinesType" },
+        "define":       { "$ref": "#/definitions/DefinesType" },
         "undefines":    { "$ref": "#/definitions/UndefinesType" },
+        "undefine":     { "$ref": "#/definitions/UndefinesType" },
         "add-paths":    { "$ref": "#/definitions/AddpathsType" },
+        "add-path":     { "$ref": "#/definitions/AddpathsType" },
         "del-paths":    { "$ref": "#/definitions/DelpathsType" },
+        "del-path":     { "$ref": "#/definitions/DelpathsType" },
         "misc":         { "$ref": "#/definitions/MiscTypes" }
       },
       "$ref": "#/definitions/TypeListMutualExclusion",
@@ -324,9 +337,13 @@
         "optimize":     { "$ref": "#/definitions/OptimizeType" },
         "debug":        { "$ref": "#/definitions/DebugType" },
         "defines":      { "$ref": "#/definitions/DefinesType" },
+        "define":       { "$ref": "#/definitions/DefinesType" },
         "undefines":    { "$ref": "#/definitions/UndefinesType" },
+        "undefine":     { "$ref": "#/definitions/UndefinesType" },
         "add-paths":    { "$ref": "#/definitions/AddpathsType" },
+        "add-path":     { "$ref": "#/definitions/AddpathsType" },
         "del-paths":    { "$ref": "#/definitions/DelpathsType" },
+        "del-path":     { "$ref": "#/definitions/DelpathsType" },
         "misc":         { "$ref": "#/definitions/MiscTypes" }
       },
       "$ref": "#/definitions/TypeListMutualExclusion",
@@ -350,9 +367,13 @@
         "optimize":     { "$ref": "#/definitions/OptimizeType" },
         "debug":        { "$ref": "#/definitions/DebugType" },
         "defines":      { "$ref": "#/definitions/DefinesType" },
+        "define":       { "$ref": "#/definitions/DefinesType" },
         "undefines":    { "$ref": "#/definitions/UndefinesType" },
+        "undefine":     { "$ref": "#/definitions/UndefinesType" },
         "add-paths":    { "$ref": "#/definitions/AddpathsType" },
+        "add-path":     { "$ref": "#/definitions/AddpathsType" },
         "del-paths":    { "$ref": "#/definitions/DelpathsType" },
+        "del-path":     { "$ref": "#/definitions/DelpathsType" },
         "misc":         { "$ref": "#/definitions/MiscType" }
       },
       "$ref": "#/definitions/TypeListMutualExclusion",
@@ -400,9 +421,13 @@
         "optimize":     { "$ref": "#/definitions/OptimizeType" },
         "debug":        { "$ref": "#/definitions/DebugType" },
         "defines":      { "$ref": "#/definitions/DefinesType" },
+        "define":       { "$ref": "#/definitions/DefinesType" },
         "undefines":    { "$ref": "#/definitions/UndefinesType" },
+        "undefine":     { "$ref": "#/definitions/UndefinesType" },
         "add-paths":    { "$ref": "#/definitions/AddpathsType" },
+        "add-path":     { "$ref": "#/definitions/AddpathsType" },
         "del-paths":    { "$ref": "#/definitions/DelpathsType" },
+        "del-path":     { "$ref": "#/definitions/DelpathsType" },
         "misc":         { "$ref": "#/definitions/MiscTypes" }
       },
       "additionalProperties": false
@@ -420,9 +445,13 @@
         "debug":       { "$ref": "#/definitions/DebugType" },
         "processor":   { "$ref": "#/definitions/ProcessorType" },
         "defines":     { "$ref": "#/definitions/DefinesType" },
+        "define":      { "$ref": "#/definitions/DefinesType" },
         "undefines":   { "$ref": "#/definitions/UndefinesType" },
+        "undefine":    { "$ref": "#/definitions/UndefinesType" },
         "add-paths":   { "$ref": "#/definitions/AddpathsType" },
+        "add-path":    { "$ref": "#/definitions/AddpathsType" },
         "del-paths":   { "$ref": "#/definitions/DelpathsType" },
+        "del-path":    { "$ref": "#/definitions/DelpathsType" },
         "misc":        { "$ref": "#/definitions/MiscTypes" },
         "groups":      { "$ref": "#/definitions/GroupsType" },
         "components":  { "$ref": "#/definitions/ComponentsType" },
@@ -444,9 +473,13 @@
         "debug":       { "$ref": "#/definitions/DebugType" },
         "processor":   { "$ref": "#/definitions/ProcessorType" },
         "defines":     { "$ref": "#/definitions/DefinesType" },
+        "define":      { "$ref": "#/definitions/DefinesType" },
         "undefines":   { "$ref": "#/definitions/UndefinesType" },
+        "undefine":    { "$ref": "#/definitions/UndefinesType" },
         "add-paths":   { "$ref": "#/definitions/AddpathsType" },
+        "add-path":    { "$ref": "#/definitions/AddpathsType" },
         "del-paths":   { "$ref": "#/definitions/DelpathsType" },
+        "del-path":    { "$ref": "#/definitions/DelpathsType" },
         "misc":        { "$ref": "#/definitions/MiscTypes" },
         "groups":      { "$ref": "#/definitions/GroupsType" },
         "components":  { "$ref": "#/definitions/ComponentsType" }
diff --git a/tools/projmgr/src/ProjMgrYamlParser.cpp b/tools/projmgr/src/ProjMgrYamlParser.cpp
index 0feb62f2b..a7100fc80 100644
--- a/tools/projmgr/src/ProjMgrYamlParser.cpp
+++ b/tools/projmgr/src/ProjMgrYamlParser.cpp
@@ -467,10 +467,26 @@ void ProjMgrYamlParser::ParseBuildType(const YAML::Node& parent, BuildType& buil
   }
   ParseProcessor(parent, buildType.processor);
   ParseMisc(parent, buildType.misc);
-  ParseVector(parent, YAML_DEFINES, buildType.defines);
-  ParseVector(parent, YAML_UNDEFINES, buildType.undefines);
-  ParseVector(parent, YAML_ADDPATHS, buildType.addpaths);
-  ParseVector(parent, YAML_DELPATHS, buildType.delpaths);
+  ParseVector(parent, YAML_DEFINE, buildType.defines);
+  if (buildType.defines.empty()) {
+    // TODO: after deprecation remove 'defines' keyword parsing in benefit of 'define'
+    ParseVector(parent, YAML_DEFINES, buildType.defines);
+  }
+  ParseVector(parent, YAML_UNDEFINE, buildType.undefines);
+  if (buildType.undefines.empty()) {
+    // TODO: after deprecation remove 'undefines' keyword parsing in benefit of 'undefine'
+    ParseVector(parent, YAML_UNDEFINES, buildType.undefines);
+  }
+  ParseVector(parent, YAML_ADDPATH, buildType.addpaths);
+  if (buildType.addpaths.empty()) {
+    // TODO: after deprecation remove 'add-paths' keyword parsing in benefit of 'add-path'
+    ParseVector(parent, YAML_ADDPATHS, buildType.addpaths);
+  }
+  ParseVector(parent, YAML_DELPATH, buildType.delpaths);
+  if (buildType.delpaths.empty()) {
+    // TODO: after deprecation remove 'del-paths' keyword parsing in benefit of 'del-path'
+    ParseVector(parent, YAML_DELPATHS, buildType.delpaths);
+  }
 }
 
 void ProjMgrYamlParser::ParseTargetType(const YAML::Node& parent, TargetType& targetType) {
@@ -509,9 +525,13 @@ const set<string> solutionKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
 };
 
@@ -532,9 +552,13 @@ const set<string> projectKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
   YAML_COMPONENTS,
   YAML_GROUPS,
@@ -553,9 +577,13 @@ const set<string> layerKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
   YAML_COMPONENTS,
   YAML_GROUPS,
@@ -572,9 +600,13 @@ const set<string> targetTypeKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
 };
 
@@ -586,9 +618,13 @@ const set<string> buildTypeKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
 };
 
@@ -632,9 +668,13 @@ const set<string> componentsKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
 };
 
@@ -647,9 +687,13 @@ const set<string> layersKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
 };
 
@@ -670,9 +714,13 @@ const set<string> groupsKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
 };
 
@@ -687,9 +735,13 @@ const set<string> filesKeys = {
   YAML_DEBUG,
   YAML_WARNINGS,
   YAML_DEFINES,
+  YAML_DEFINE,
   YAML_UNDEFINES,
+  YAML_UNDEFINE,
   YAML_ADDPATHS,
+  YAML_ADDPATH,
   YAML_DELPATHS,
+  YAML_DELPATH,
   YAML_MISC,
 };
 
diff --git a/tools/projmgr/test/data/TestAccessSequences/malformed-access-sequences1.cproject.yml b/tools/projmgr/test/data/TestAccessSequences/malformed-access-sequences1.cproject.yml
index 30f5afa28..0c654f730 100644
--- a/tools/projmgr/test/data/TestAccessSequences/malformed-access-sequences1.cproject.yml
+++ b/tools/projmgr/test/data/TestAccessSequences/malformed-access-sequences1.cproject.yml
@@ -3,7 +3,7 @@
 project:
   device: RteTest_ARMCM0
   compiler: AC6
-  defines:
+  define:
     - DEF1-$Dname$
     - DEF2-$Dnamelong$
     - DEF3-$Dname
diff --git a/tools/projmgr/test/data/TestAccessSequences/malformed-access-sequences2.cproject.yml b/tools/projmgr/test/data/TestAccessSequences/malformed-access-sequences2.cproject.yml
index 9ab5a62b2..29b7afb8c 100644
--- a/tools/projmgr/test/data/TestAccessSequences/malformed-access-sequences2.cproject.yml
+++ b/tools/projmgr/test/data/TestAccessSequences/malformed-access-sequences2.cproject.yml
@@ -3,7 +3,7 @@
 project:
   device: RteTest_ARMCM0
   compiler: AC6
-  defines:
+  define:
     - DEF1-$OutDir(malformed-access-sequences2)$
     - DEF2-$OutDirs(malformed-access-sequences2)$
     - DEF3-$OutDir(malformed-access-sequences2$)
diff --git a/tools/projmgr/test/data/TestAccessSequences/test-access-sequences.csolution.yml b/tools/projmgr/test/data/TestAccessSequences/test-access-sequences.csolution.yml
index b74bf37e2..4e9c5919d 100644
--- a/tools/projmgr/test/data/TestAccessSequences/test-access-sequences.csolution.yml
+++ b/tools/projmgr/test/data/TestAccessSequences/test-access-sequences.csolution.yml
@@ -7,18 +7,18 @@ solution:
       misc:
         - compiler: AC6
           C-CPP: [-C-CPP-$Dname$]
-      defines: 
+      define: 
         - DEF-CM0-$Dname$-$Bname$
-      add-paths:
+      add-path:
         - ./path/CM0/$Dname$
     - type: CM3
       device: RteTest_ARMCM3
       misc:
         - compiler: AC6
           C-CPP: [-C-CPP-$Dname$]
-      defines:
+      define:
         - DEF-CM3-$Dname$
-      add-paths:
+      add-path:
         - ./path/CM3/$Dname$
 
   build-types:
diff --git a/tools/projmgr/test/data/TestAccessSequences/test-access-sequences1.cproject.yml b/tools/projmgr/test/data/TestAccessSequences/test-access-sequences1.cproject.yml
index cc2c611b7..0dd441eb3 100644
--- a/tools/projmgr/test/data/TestAccessSequences/test-access-sequences1.cproject.yml
+++ b/tools/projmgr/test/data/TestAccessSequences/test-access-sequences1.cproject.yml
@@ -1,7 +1,7 @@
 ### CMSIS Project Description ###
 
 project:
-  defines:
+  define:
     - DEF1-PROJ1-$Output(test-access-sequences2.Debug)$
     - DEF2-PROJ1-$Output(test-access-sequences2+CM3)$
     - DEF3-PROJ1-$Output(test-access-sequences2.Release+CM0)$
diff --git a/tools/projmgr/test/data/TestAccessSequences/test-access-sequences2.cproject.yml b/tools/projmgr/test/data/TestAccessSequences/test-access-sequences2.cproject.yml
index b91cc0e20..359ddeecb 100644
--- a/tools/projmgr/test/data/TestAccessSequences/test-access-sequences2.cproject.yml
+++ b/tools/projmgr/test/data/TestAccessSequences/test-access-sequences2.cproject.yml
@@ -3,9 +3,9 @@
 project:
   misc:
     - C-CPP: [PROJ2-D($Dname$)-B($Bname$)]
-  defines:
+  define:
     - $Output(test-access-sequences1)$
-  add-paths:
+  add-path:
     - $Output(test-access-sequences1)$
   components:
     - component: CORE
diff --git a/tools/projmgr/test/data/TestAccessSequences/test-access-sequences3.cproject.yml b/tools/projmgr/test/data/TestAccessSequences/test-access-sequences3.cproject.yml
index 1ffc4a0bb..ce32a2a44 100644
--- a/tools/projmgr/test/data/TestAccessSequences/test-access-sequences3.cproject.yml
+++ b/tools/projmgr/test/data/TestAccessSequences/test-access-sequences3.cproject.yml
@@ -2,7 +2,7 @@
 
 project:
   device: RteTest_ARMCM0
-  defines:
+  define:
     - DEF1-PROJ1-$Output(test-access-sequences3.Debug)$
     - DEF2-PROJ1-$Output(test-access-sequences3.Release)$
   components:
diff --git a/tools/projmgr/test/data/TestLayers/Layer1/layer1.clayer.yml b/tools/projmgr/test/data/TestLayers/Layer1/layer1.clayer.yml
index 50b7a063f..7db6dd835 100644
--- a/tools/projmgr/test/data/TestLayers/Layer1/layer1.clayer.yml
+++ b/tools/projmgr/test/data/TestLayers/Layer1/layer1.clayer.yml
@@ -3,9 +3,9 @@
 layer:
   description: Layer 1
   device: RteTest_ARMCM0
-  defines:
+  define:
     - DEF_LAYER1
-  add-paths:
+  add-path:
     - path/to/layer1
   compiler: AC6@6.18.0
   misc:
diff --git a/tools/projmgr/test/data/TestLayers/Layer1/layer1.clayer_pname.yml b/tools/projmgr/test/data/TestLayers/Layer1/layer1.clayer_pname.yml
index 5ebd3ab2b..414960fc8 100644
--- a/tools/projmgr/test/data/TestLayers/Layer1/layer1.clayer_pname.yml
+++ b/tools/projmgr/test/data/TestLayers/Layer1/layer1.clayer_pname.yml
@@ -3,9 +3,9 @@
 layer:
   description: Layer 1
   device: RteTest_ARMCM0_Dual
-  defines:
+  define:
     - DEF_LAYER1
-  add-paths:
+  add-path:
     - path/to/layer1
   compiler: AC6@6.18.0
   misc:
diff --git a/tools/projmgr/test/data/TestLayers/Layer2/layer2.clayer.yml b/tools/projmgr/test/data/TestLayers/Layer2/layer2.clayer.yml
index c7badc894..c1aad7baf 100644
--- a/tools/projmgr/test/data/TestLayers/Layer2/layer2.clayer.yml
+++ b/tools/projmgr/test/data/TestLayers/Layer2/layer2.clayer.yml
@@ -2,9 +2,9 @@
 
 layer:
   description: Layer 2
-  defines:
+  define:
     - DEF_LAYER2
-  add-paths:
+  add-path:
     - path/to/layer2
   misc:
     - C:
diff --git a/tools/projmgr/test/data/TestLayers/Layer2/layer2.clayer_package_with_pname.yml b/tools/projmgr/test/data/TestLayers/Layer2/layer2.clayer_package_with_pname.yml
index e2612feec..452602318 100644
--- a/tools/projmgr/test/data/TestLayers/Layer2/layer2.clayer_package_with_pname.yml
+++ b/tools/projmgr/test/data/TestLayers/Layer2/layer2.clayer_package_with_pname.yml
@@ -2,9 +2,9 @@
 
 layer:
   description: Layer 2
-  defines:
+  define:
     - DEF_LAYER2
-  add-paths:
+  add-path:
     - path/to/layer2
   misc:
     - C:
diff --git a/tools/projmgr/test/data/TestLayers/Layer3/layer3.clayer.yml b/tools/projmgr/test/data/TestLayers/Layer3/layer3.clayer.yml
index 220f0497b..1a8e93860 100644
--- a/tools/projmgr/test/data/TestLayers/Layer3/layer3.clayer.yml
+++ b/tools/projmgr/test/data/TestLayers/Layer3/layer3.clayer.yml
@@ -2,9 +2,9 @@
 
 layer:
   description: Layer 3
-  defines:
+  define:
     - DEF_LAYER3
-  add-paths:
+  add-path:
     - path/to/layer3
   misc:
     - C:
diff --git a/tools/projmgr/test/data/TestSolution/TestProject1/test1.cproject.yml b/tools/projmgr/test/data/TestSolution/TestProject1/test1.cproject.yml
index 23a0ac2dc..4558d71d6 100644
--- a/tools/projmgr/test/data/TestSolution/TestProject1/test1.cproject.yml
+++ b/tools/projmgr/test/data/TestSolution/TestProject1/test1.cproject.yml
@@ -9,13 +9,13 @@ project:
   components:
     - component: Startup
     - component: CORE
-      defines:
+      define:
         - DEF1-COMPONENT
-      undefines:
+      undefine:
         - DEF2-COMPONENT
-      add-paths:
+      add-path:
         - ./path/1/component
-      del-paths:
+      del-path:
         - ./path/2/component
     - component: RteTest.Check.Missing
       not-for-type:
@@ -23,16 +23,16 @@ project:
         - .Release
   groups:
     - group: Sources
-      defines:
+      define:
         - DEF1-GROUP-PROJECT
         - DEF2-GROUP-PROJECT
-      undefines:
+      undefine:
         - DEF3-GROUP-PROJECT
         - DEF4-GROUP-PROJECT
-      add-paths:
+      add-path:
         - ./path/sources/1/group
         - ./path/sources/2/group
-      del-paths:
+      del-path:
         - ./path/sources/3/group
         - ./path/sources/4/group
       misc:
@@ -43,16 +43,16 @@ project:
           Lib: [-Lib-group]
       files: 
         - file: main.c
-          defines:
+          define:
             - DEF1-FILE-PROJECT
             - DEF2-FILE-PROJECT
-          undefines:
+          undefine:
             - DEF3-FILE-PROJECT
             - DEF4-FILE-PROJECT
-          add-paths:
+          add-path:
             - ./path/main/1/file
             - ./path/main/2/file
-          del-paths:
+          del-path:
             - ./path/main/3/file
             - ./path/main/4/file
           misc:
@@ -76,13 +76,13 @@ project:
       for-type: .Release
       files:
         - file: release.c
-          defines:
+          define:
             - DEF1-REL-FILE
-          undefines:
+          undefine:
             - DEF2-REL-FILE
-          add-paths:
+          add-path:
             - ./path/1/release/file
-          del-paths:
+          del-path:
             - ./path/2/release/file
         - file: excluded.c
           not-for-type: .Release
diff --git a/tools/projmgr/test/data/TestSolution/TestProject2/test2.cproject.yml b/tools/projmgr/test/data/TestSolution/TestProject2/test2.cproject.yml
index b3207c9dc..19e43e6e9 100644
--- a/tools/projmgr/test/data/TestSolution/TestProject2/test2.cproject.yml
+++ b/tools/projmgr/test/data/TestSolution/TestProject2/test2.cproject.yml
@@ -9,10 +9,10 @@ project:
     ASM: [-ASM-project]
     Link: [-Link-project]
     Lib: [-Lib-project]
-  defines:
+  define:
     - DEF-project
     - DEF-project-to-be-removed
-  add-paths:
+  add-path:
     - ./path/project
     - ../path/project/to-be-removed
   components:
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution.yml b/tools/projmgr/test/data/TestSolution/test.csolution.yml
index dccfe6d3a..bcf355917 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
       processor:
         fpu: off
@@ -32,15 +32,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -48,14 +48,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
       processor:
@@ -67,14 +67,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -87,13 +87,13 @@ solution:
     - project: ./TestProject2/test2.cproject.yml
       not-for-type: .Release
 
-  defines:
+  define:
     - DEF-solution
     - DEF-solution-to-be-removed
-  undefines:
+  undefine:
     - DEF-project-to-be-removed
-  add-paths:
+  add-path:
     - ./path/solution/
     - ./path/solution/to-be-removed
-  del-paths:
+  del-path:
     - ./path/project/to-be-removed
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_filtered_pack_selection.yml b/tools/projmgr/test/data/TestSolution/test.csolution_filtered_pack_selection.yml
index c4bdce0e3..72a924c77 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_filtered_pack_selection.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_filtered_pack_selection.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
     - type: CM3
@@ -29,15 +29,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -45,14 +45,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -60,14 +60,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -80,13 +80,13 @@ solution:
     - project: ./TestProject2/test2.cproject.yml
       not-for-type: .Release
 
-  defines:
+  define:
     - DEF-solution
     - DEF-solution-to-be-removed
-  undefines:
+  undefine:
     - DEF-project-to-be-removed
-  add-paths:
+  add-path:
     - ./path/solution/
     - ./path/solution/to-be-removed
-  del-paths:
+  del-path:
     - ./path/project/to-be-removed
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_invalid_pack.yml b/tools/projmgr/test/data/TestSolution/test.csolution_invalid_pack.yml
index 2c0963e52..ad008570e 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_invalid_pack.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_invalid_pack.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
     - type: CM3
@@ -29,15 +29,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -45,14 +45,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -60,14 +60,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -80,13 +80,13 @@ solution:
     - project: ./TestProject2/test2.cproject.yml
       not-for-type: .Release
 
-  defines:
+  define:
     - DEF-solution
     - DEF-solution-to-be-removed
-  undefines:
+  undefine:
     - DEF-project-to-be-removed
-  add-paths:
+  add-path:
     - ./path/solution/
     - ./path/solution/to-be-removed
-  del-paths:
+  del-path:
     - ./path/project/to-be-removed
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_file_not_found.yml b/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_file_not_found.yml
index 237a00488..3e381e4bb 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_file_not_found.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_file_not_found.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
     - type: CM3
       device: RteTest_ARMCM3
@@ -28,15 +28,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -44,14 +44,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -59,14 +59,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_path.yml b/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_path.yml
index 5ca346bb0..3b316490d 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_path.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_path.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
     - type: CM3
       device: RteTest_ARMCM3
@@ -28,15 +28,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -44,14 +44,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -59,14 +59,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_path_not_found.yml b/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_path_not_found.yml
index 4135837f7..5d5c25b91 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_path_not_found.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_local_pack_path_not_found.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
     - type: CM3
       device: RteTest_ARMCM3
@@ -28,15 +28,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -44,14 +44,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -59,14 +59,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_missing_project.yml b/tools/projmgr/test/data/TestSolution/test.csolution_missing_project.yml
index d7f4cda9a..0b801865c 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_missing_project.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_missing_project.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
     - type: CM3
       device: RteTest_ARMCM3
@@ -28,29 +28,29 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
     - type: Debug
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -58,14 +58,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_no_buildtypes.yml b/tools/projmgr/test/data/TestSolution/test.csolution_no_buildtypes.yml
index 171c0753a..feb81ac39 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_no_buildtypes.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_no_buildtypes.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
     - type: CM3
       device: RteTest_ARMCM3
@@ -28,29 +28,29 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
     - type: Debug
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -58,14 +58,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -75,13 +75,13 @@ solution:
     - project: ./TestProject2/test2.cproject.yml
       not-for-type: .Release
 
-  defines:
+  define:
     - DEF-solution
     - DEF-solution-to-be-removed
-  undefines:
+  undefine:
     - DEF-project-to-be-removed
-  add-paths:
+  add-path:
     - ./path/solution/
     - ./path/solution/to-be-removed
-  del-paths:
+  del-path:
     - ./path/project/to-be-removed
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_no_device_name.yml b/tools/projmgr/test/data/TestSolution/test.csolution_no_device_name.yml
index dc8efa71d..198fcd567 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_no_device_name.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_no_device_name.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
     - type: CM3
       device: RteTest_ARMCM3
@@ -28,15 +28,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -44,14 +44,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -59,14 +59,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -76,13 +76,13 @@ solution:
     - project: ./TestProject2/test2.cproject.yml
       not-for-type: .Release
 
-    defines:
+    define:
       - DEF-solution
       - DEF-solution-to-be-removed
-    undefines:
+    undefine:
       - DEF-project-to-be-removed
-    add-paths:
+    add-path:
       - ./path/solution/
       - ./path/solution/to-be-removed
-    del-paths:
+    del-path:
       - ./path/project/to-be-removed
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_no_packs.yml b/tools/projmgr/test/data/TestSolution/test.csolution_no_packs.yml
index 419d6fd52..9beb8f779 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_no_packs.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_no_packs.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
     - type: CM3
@@ -29,15 +29,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -45,14 +45,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -60,14 +60,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -77,13 +77,13 @@ solution:
     - project: ./TestProject2/test2.cproject.yml
       not-for-type: .Release
 
-  defines:
+  define:
     - DEF-solution
     - DEF-solution-to-be-removed
-  undefines:
+  undefine:
     - DEF-project-to-be-removed
-  add-paths:
+  add-path:
     - ./path/solution/
     - ./path/solution/to-be-removed
-  del-paths:
+  del-path:
     - ./path/project/to-be-removed
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_pack_selection.yml b/tools/projmgr/test/data/TestSolution/test.csolution_pack_selection.yml
index 4d456e856..fb8a8fe91 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_pack_selection.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_pack_selection.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
     - type: TestGen
@@ -29,15 +29,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -45,14 +45,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -60,14 +60,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -83,13 +83,13 @@ solution:
     - project: ./TestProject2/test2.cproject.yml
       not-for-type: .Release
 
-  defines:
+  define:
     - DEF-solution
     - DEF-solution-to-be-removed
-  undefines:
+  undefine:
     - DEF-project-to-be-removed
-  add-paths:
+  add-path:
     - ./path/solution/
     - ./path/solution/to-be-removed
-  del-paths:
+  del-path:
     - ./path/project/to-be-removed
diff --git a/tools/projmgr/test/data/TestSolution/test.csolution_pname.yml b/tools/projmgr/test/data/TestSolution/test.csolution_pname.yml
index f02d5a2e7..7529ebf24 100644
--- a/tools/projmgr/test/data/TestSolution/test.csolution_pname.yml
+++ b/tools/projmgr/test/data/TestSolution/test.csolution_pname.yml
@@ -10,15 +10,15 @@ solution:
           ASM: [-ASM-type-CM0]
           Link: [-Link-type-CM0]
           Lib: [-Lib-type-CM0]
-      defines: 
+      define: 
         - DEF-CM0
         - DEF-CM0-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM0
         - ./path/CM0/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
     - type: CM3
       device: RteTest_ARMCM3
@@ -28,15 +28,15 @@ solution:
           ASM: [-ASM-type-CM3]
           Link: [-Link-type-CM3]
           Lib: [-Lib-type-CM3]
-      defines:
+      define:
         - DEF-CM3
         - DEF-CM3-to-be-removed
-      undefines:
+      undefine:
         - DEF-solution-to-be-removed
-      add-paths:
+      add-path:
         - ./path/CM3
         - ./path/CM3/to-be-removed
-      del-paths:
+      del-path:
         - ./path/solution/to-be-removed
 
   build-types:
@@ -44,14 +44,14 @@ solution:
       compiler: AC6
       optimize: debug
       debug: on
-      defines:
+      define:
         - DEF-Debug
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Debug
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -59,14 +59,14 @@ solution:
       compiler: GCC
       optimize: max
       debug: off
-      defines:
+      define:
         - DEF-Release
-      undefines:
+      undefine:
         - DEF-CM0-to-be-removed
         - DEF-CM3-to-be-removed
-      add-paths:
+      add-path:
         - ./path/Release
-      del-paths:
+      del-path:
         - ./path/CM0/to-be-removed
         - ./path/CM3/to-be-removed
 
@@ -74,13 +74,13 @@ solution:
     - project: ./TestProject2/test2.cproject.yml
       not-for-type: .Release
 
-  defines:
+  define:
     - DEF-solution
     - DEF-solution-to-be-removed
-  undefines:
+  undefine:
     - DEF-project-to-be-removed
-  add-paths:
+  add-path:
     - ./path/solution/
     - ./path/solution/to-be-removed
-  del-paths:
+  del-path:
     - ./path/project/to-be-removed
diff --git a/tools/projmgr/test/data/TrustZoneSolution/NonSecureCode/NonSecure.cproject.yml b/tools/projmgr/test/data/TrustZoneSolution/NonSecureCode/NonSecure.cproject.yml
index 275c725cf..30143c49c 100644
--- a/tools/projmgr/test/data/TrustZoneSolution/NonSecureCode/NonSecure.cproject.yml
+++ b/tools/projmgr/test/data/TrustZoneSolution/NonSecureCode/NonSecure.cproject.yml
@@ -4,7 +4,7 @@ project:
   misc:
     - compiler: AC6
       C: [-fshort-enums, -fshort-wchar]
-  add-paths:
+  add-path:
     - $OutDir(Secure)$
   components:
     - component: C Startup
diff --git a/tools/projmgr/test/data/TrustZoneSolutionLayersTypes/layers/app/NonSecureCode/NonSecure.clayer.yml b/tools/projmgr/test/data/TrustZoneSolutionLayersTypes/layers/app/NonSecureCode/NonSecure.clayer.yml
index d931af765..c228dd112 100644
--- a/tools/projmgr/test/data/TrustZoneSolutionLayersTypes/layers/app/NonSecureCode/NonSecure.clayer.yml
+++ b/tools/projmgr/test/data/TrustZoneSolutionLayersTypes/layers/app/NonSecureCode/NonSecure.clayer.yml
@@ -12,7 +12,7 @@ layer:
     - group: Non-secure Code
       files: 
         - file: main_ns.c
-          add-paths:
+          add-path:
             - ../Interface
     - group: CMSE
       files:
diff --git a/tools/projmgr/test/data/TrustZoneSolutionLayersTypes/layers/app/SecureCode/Secure.clayer.yml b/tools/projmgr/test/data/TrustZoneSolutionLayersTypes/layers/app/SecureCode/Secure.clayer.yml
index 1320a48d3..b3a223c0a 100644
--- a/tools/projmgr/test/data/TrustZoneSolutionLayersTypes/layers/app/SecureCode/Secure.clayer.yml
+++ b/tools/projmgr/test/data/TrustZoneSolutionLayersTypes/layers/app/SecureCode/Secure.clayer.yml
@@ -13,6 +13,6 @@ layer:
     - group: CMSE
       files: 
         - file: interface.c
-          add-paths:
+          add-path:
             - ../Interface
         - file: tz_context.c