72 files changed, 220 insertions, 61 deletions

diff --git a/csarvalidation/pom.xml b/csarvalidation/pom.xml
index 3ccc8eb..2f2fdda 100644
--- a/csarvalidation/pom.xml
+++ b/csarvalidation/pom.xml
@@ -105,7 +105,7 @@
     </dependency>
     <dependency>
       <groupId>org.onap.vnfsdk.validation</groupId>
-      <artifactId>validation-pmdictionary</artifactId>
+      <artifactId>validation-dictionary</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR816745IntegrationTest.java b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR816745IntegrationTest.java
index 17e9de3..39f7836 100644
--- a/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR816745IntegrationTest.java
+++ b/csarvalidation/src/test/java/org/onap/cvc/csar/cc/sol004/VTPValidateCSARR816745IntegrationTest.java
@@ -139,7 +139,7 @@ public class VTPValidateCSARR816745IntegrationTest {
         // then
         List<CSARArchive.CSARError> errors = testCase.getErrors();
         assertThat(errors.size()).isEqualTo(1);
-        assertThat(convertToMessagesList(errors)).contains("Fail to load PM_Dictionary With error: PM_Dictionary YAML file is empty");
+        assertThat(convertToMessagesList(errors)).contains("Fail to load PM_Dictionary With error: Dictionary YAML file is empty");
     }
 
     @Test
diff --git a/csarvalidation/src/test/java/org/onap/functional/PnfValidationFunctionalTest.java b/csarvalidation/src/test/java/org/onap/functional/PnfValidationFunctionalTest.java
index 3e3877e..008b6d1 100644
--- a/csarvalidation/src/test/java/org/onap/functional/PnfValidationFunctionalTest.java
+++ b/csarvalidation/src/test/java/org/onap/functional/PnfValidationFunctionalTest.java
@@ -318,7 +318,7 @@ public class PnfValidationFunctionalTest {
         List<OnapCliValidationResponseWrapper.ValidationResultWrapper.ValidationErrorWrapper> expectedPnfDictionaryErrors =
                 List.of(
                         createExpectedError(PM_DICTIONARY_YAML_RULE, "0x2000",
-                                "Fail to load PM_Dictionary With error: PM_Dictionary YAML file is empty",
+                                "Fail to load PM_Dictionary With error: Dictionary YAML file is empty",
                                 "Artifacts/Deployment/Measurements/PM_Dictionary.yml"
                         )
                 );
diff --git a/pmdictionaryvalidation/README.md b/dictionaryvalidation/README.md
index 2bc91a5..4e1a6f5 100644
--- a/pmdictionaryvalidation/README.md
+++ b/dictionaryvalidation/README.md
@@ -1,25 +1,25 @@
-PMDictionary Validation
+Dictionary Validation
 =======================
-This module can be used as a library to validate pmdictionary against the schema (schema is the first document in the file).
+This module can be used as a library to validate dictionary against the schema (schema is the first document in the file).
 
-How to use PMDictionary validation library
+How to use Dictionary validation library
 ------------------------------------------
-VNF-SDK validation library (pmdictionaryvalidation) should be used to validate the PM_Dictionary file.
+VNF-SDK validation library (dictionaryvalidation) should be used to validate the Dictionary file.
     Below dependency should be added to the required modules in your project.
 
         <dependency>
             <groupId>org.onap.vnfsdk.validation</groupId>
-            <artifactId>validation-pmdictionary</artifactId>
+            <artifactId>validation-dictionary</artifactId>
             <version>version</version>
         </dependency>
 
-How to validate PMDictionary
+How to validate Dictionary
 --------------------------
-1.Validate PMDictionary from a path to the file.
+1.Validate Dictionary from a path to the file.
 
     new YamlContentValidator().validate(pathToFile)
 
-2.Validate PMDictionary file from the byte array.
+2.Validate Dictionary file from the byte array.
 
     new YamlContentValidator().validate(fileContentAsByteArray)
 
diff --git a/pmdictionaryvalidation/pom.xml b/dictionaryvalidation/pom.xml
index 8046fb4..07bf873 100644
--- a/pmdictionaryvalidation/pom.xml
+++ b/dictionaryvalidation/pom.xml
@@ -9,9 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>validation-pmdictionary</artifactId>
+    <artifactId>validation-dictionary</artifactId>
     <packaging>jar</packaging>
-    <name>pmdictionaryvalidation/validation</name>
+    <name>dictionaryvalidation/validation</name>
 
     <repositories>
         <repository>
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/Main.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/Main.java
index 5ab2e69..ddeecbf 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/Main.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/Main.java
@@ -18,7 +18,7 @@ package org.onap.validation.cli;
 
 import org.onap.validation.cli.command.validate.ResponseStorage;
 import org.onap.validation.cli.command.validate.ToJsonConverter;
-import org.onap.validation.cli.command.validate.ValidatePmDictionaryYamlCommand;
+import org.onap.validation.cli.command.validate.ValidateDictionaryYamlCommand;
 import org.onap.validation.cli.core.Cli;
 import org.onap.validation.cli.core.Console;
 import org.onap.validation.yaml.util.Args;
@@ -42,7 +42,7 @@ public class Main {
 
         return cli.run(
                 new Args(List.of(args)),
-                new ValidatePmDictionaryYamlCommand(new ToJsonConverter())
+                new ValidateDictionaryYamlCommand(new ToJsonConverter())
         );
     }
 }
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/OutputFilePathGenerator.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/OutputFilePathGenerator.java
index 2ed7285..2ed7285 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/OutputFilePathGenerator.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/OutputFilePathGenerator.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ResponseModel.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ResponseModel.java
index 033031d..033031d 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ResponseModel.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ResponseModel.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ResponseStorage.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ResponseStorage.java
index 3daed16..3daed16 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ResponseStorage.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ResponseStorage.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ToJsonConverter.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ToJsonConverter.java
index 168daf8..168daf8 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ToJsonConverter.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ToJsonConverter.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ToResponseModelConverter.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ToResponseModelConverter.java
index 674068f..674068f 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ToResponseModelConverter.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ToResponseModelConverter.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ValidatePmDictionaryYamlCommand.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ValidateDictionaryYamlCommand.java
index ceb46d3..68b0b7a 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ValidatePmDictionaryYamlCommand.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/command/validate/ValidateDictionaryYamlCommand.java
@@ -28,7 +28,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 
-public class ValidatePmDictionaryYamlCommand implements Command<String> {
+public class ValidateDictionaryYamlCommand implements Command<String> {
 
     public static final int PATH_TO_FILE_INDEX = 0;
     private final YamlContentValidator yamlContentValidator  = new YamlContentValidator();
@@ -36,7 +36,7 @@ public class ValidatePmDictionaryYamlCommand implements Command<String> {
     private final ToJsonConverter toJsonConverter;
     private final OutputFilePathGenerator filePathGenerator = new OutputFilePathGenerator();
 
-    public ValidatePmDictionaryYamlCommand(ToJsonConverter toJsonConverter) {
+    public ValidateDictionaryYamlCommand(ToJsonConverter toJsonConverter) {
         this.toJsonConverter = toJsonConverter;
     }
 
@@ -53,7 +53,7 @@ public class ValidatePmDictionaryYamlCommand implements Command<String> {
 
     @Override
     public String getName() {
-        return "Validate PM Dictionary yaml";
+        return "Validate Dictionary yaml";
     }
 
     @Override
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/Cli.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/Cli.java
index bf2abad..bf2abad 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/Cli.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/Cli.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/Command.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/Command.java
index 1da724f..1da724f 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/Command.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/Command.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/CommandException.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/CommandException.java
index 2c72ff8..2c72ff8 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/CommandException.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/CommandException.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/CommandResponse.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/CommandResponse.java
index 73db4ab..73db4ab 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/CommandResponse.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/CommandResponse.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/Console.java b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/Console.java
index 4c20437..4c20437 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/cli/core/Console.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/cli/core/Console.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/rule/PMDictionaryValidate.java b/dictionaryvalidation/src/main/java/org/onap/validation/rule/DictionaryValidate.java
index 663dceb..c3b96b4 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/rule/PMDictionaryValidate.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/rule/DictionaryValidate.java
@@ -25,7 +25,7 @@ import org.onap.validation.cli.command.validate.ResponseModel;
 import org.onap.validation.cli.command.validate.ResponseModel.ResponseStatus;
 import org.onap.validation.cli.command.validate.ToJsonConverter;
 import org.onap.validation.cli.command.validate.ToResponseModelConverter;
-import org.onap.validation.cli.command.validate.ValidatePmDictionaryYamlCommand;
+import org.onap.validation.cli.command.validate.ValidateDictionaryYamlCommand;
 import org.onap.validation.cli.core.CommandException;
 import org.onap.validation.cli.core.CommandResponse;
 import org.onap.validation.yaml.util.Args;
@@ -38,8 +38,8 @@ import java.util.List;
 /**
  * Validates CSAR
  */
-@OnapCommandSchema(schema = "pm-dictionary-validate.yaml")
-public class PMDictionaryValidate extends OnapCommand {
+@OnapCommandSchema(schema = "dictionary-validate.yaml")
+public class DictionaryValidate extends OnapCommand {
 
     private static final String VALIDATION_PASS = "PASS";
     private static final String VALIDATION_FAILED = "FAILED";
@@ -50,7 +50,7 @@ public class PMDictionaryValidate extends OnapCommand {
     public static final String PARAM_OUT_ERRORS = "errors";
     private final Gson gson = new Gson();
 
-    private static final Logger logger = LoggerFactory.getLogger(PMDictionaryValidate.class);
+    private static final Logger logger = LoggerFactory.getLogger(DictionaryValidate.class);
 
     @Override
     protected void run() throws OnapCommandException {
@@ -92,26 +92,26 @@ public class PMDictionaryValidate extends OnapCommand {
     }
 
     private void setOclipResponse(String pathToFile, Date timestamp, String criteria, String errors) {
-        final PMDictionaryValidateResponse pmDictionaryValidateResponse = new PMDictionaryValidateResponse(
+        final DictionaryValidateResponse dictionaryValidateResponse = new DictionaryValidateResponse(
                 pathToFile,
                 timestamp.toString(),
                 criteria,
                 errors
         );
-        setOclipResponse(pmDictionaryValidateResponse);
+        setOclipResponse(dictionaryValidateResponse);
     }
 
-    private void setOclipResponse(PMDictionaryValidateResponse pmDictionaryValidateResponse) {
-        this.getResult().getRecordsMap().get(PARAM_OUT_FILE).getValues().add(pmDictionaryValidateResponse.getFile());
-        this.getResult().getRecordsMap().get(PARAM_OUT_DATE).getValues().add(pmDictionaryValidateResponse.getDate());
-        this.getResult().getRecordsMap().get(PARAM_OUT_CRITERIA).getValues().add(pmDictionaryValidateResponse.getCriteria());
-        this.getResult().getRecordsMap().get(PARAM_OUT_ERRORS).getValues().add(pmDictionaryValidateResponse.getErrors());
-        this.getResult().setOutput(transformToJson(pmDictionaryValidateResponse));
+    private void setOclipResponse(DictionaryValidateResponse dictionaryValidateResponse) {
+        this.getResult().getRecordsMap().get(PARAM_OUT_FILE).getValues().add(dictionaryValidateResponse.getFile());
+        this.getResult().getRecordsMap().get(PARAM_OUT_DATE).getValues().add(dictionaryValidateResponse.getDate());
+        this.getResult().getRecordsMap().get(PARAM_OUT_CRITERIA).getValues().add(dictionaryValidateResponse.getCriteria());
+        this.getResult().getRecordsMap().get(PARAM_OUT_ERRORS).getValues().add(dictionaryValidateResponse.getErrors());
+        this.getResult().setOutput(transformToJson(dictionaryValidateResponse));
         this.getResult().setType(OnapCommandResultType.TEXT);
     }
 
     private ResponseModel executeValidation(String path) throws CommandException {
-        final ValidatePmDictionaryYamlCommand validation = new ValidatePmDictionaryYamlCommand(new ToJsonConverter());
+        final ValidateDictionaryYamlCommand validation = new ValidateDictionaryYamlCommand(new ToJsonConverter());
         final CommandResponse<String> commandResponse = validation.execute(new Args(List.of(path)));
         final String result = commandResponse.getResult();
 
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/rule/PMDictionaryValidateResponse.java b/dictionaryvalidation/src/main/java/org/onap/validation/rule/DictionaryValidateResponse.java
index 3eb706b..684cf7b 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/rule/PMDictionaryValidateResponse.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/rule/DictionaryValidateResponse.java
@@ -15,16 +15,16 @@
  */
 package org.onap.validation.rule;
 
-public class PMDictionaryValidateResponse {
+public class DictionaryValidateResponse {
 
-    public static final String PLATFORM_VTP_1_0 = "PM Dictionary Test Platform (VTP) 1.0";
+    public static final String PLATFORM_VTP_1_0 = "Dictionary Test Platform (VTP) 1.0";
     public static final String ONAP_DISCUSS_LISTS_ONAP_ORG = "ONAP VTP Team onap-discuss@lists.onap.org";
     private final String file;
     private final String date;
     private final String criteria;
     private final String errors;
 
-    public PMDictionaryValidateResponse(String file, String date, String criteria, String errors) {
+    public DictionaryValidateResponse(String file, String date, String criteria, String errors) {
         this.file = file;
         this.date = date;
         this.criteria = criteria;
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlContentValidator.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlContentValidator.java
index 5e1238b..4501113 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlContentValidator.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlContentValidator.java
@@ -48,7 +48,7 @@ public class YamlContentValidator {
 
     private List<YamlDocumentValidationError> getYamlDocumentValidationErrors(List<YamlDocument> documents) throws YamlProcessingException {
         if (documents.isEmpty()) {
-            throw new YamlProcessingException("PM_Dictionary YAML file is empty");
+            throw new YamlProcessingException("Dictionary YAML file is empty");
         } else {
             return validateDocuments(documents);
         }
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlLoader.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlLoader.java
index c23da0a..c23da0a 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlLoader.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlLoader.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlValidator.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlValidator.java
index 30ba646..30ba646 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlValidator.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/YamlValidator.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/error/SchemaValidationError.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/error/SchemaValidationError.java
index 6ffe6d4..6ffe6d4 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/error/SchemaValidationError.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/error/SchemaValidationError.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/error/YamlDocumentValidationError.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/error/YamlDocumentValidationError.java
index f04708f..f04708f 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/error/YamlDocumentValidationError.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/error/YamlDocumentValidationError.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/exception/YamlProcessingException.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/exception/YamlProcessingException.java
index 99c2437..99c2437 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/exception/YamlProcessingException.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/exception/YamlProcessingException.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocument.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocument.java
index 557b6fd..557b6fd 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocument.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocument.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocumentFactory.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocumentFactory.java
index b56422c..b56422c 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocumentFactory.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlDocumentFactory.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParameterListFactory.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParameterListFactory.java
index 5f41c5c..5f41c5c 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParameterListFactory.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParameterListFactory.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParametersList.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParametersList.java
index 2b93c74..2b93c74 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParametersList.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/model/YamlParametersList.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationProcess.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationProcess.java
index ebd37ce..ebd37ce 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationProcess.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationProcess.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationStep.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationStep.java
index eb5ab8e..eb5ab8e 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationStep.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/process/YamlValidationStep.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchema.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchema.java
index 69bb6cd..69bb6cd 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchema.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchema.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchemaFactory.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchemaFactory.java
index df7d673..df7d673 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchemaFactory.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/YamlSchemaFactory.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaBranchNode.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaBranchNode.java
index a3e9636..a3e9636 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaBranchNode.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaBranchNode.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaLeafNode.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaLeafNode.java
index c98f41e..c98f41e 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaLeafNode.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaLeafNode.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNode.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNode.java
index 28913a2..28913a2 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNode.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNode.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactory.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactory.java
index 79a8f14..79a8f14 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactory.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactory.java
diff --git a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/util/Args.java b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/util/Args.java
index 9ae44c8..9ae44c8 100644
--- a/pmdictionaryvalidation/src/main/java/org/onap/validation/yaml/util/Args.java
+++ b/dictionaryvalidation/src/main/java/org/onap/validation/yaml/util/Args.java
diff --git a/pmdictionaryvalidation/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand b/dictionaryvalidation/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand
index 72d9f1f..9d1b8a2 100644
--- a/pmdictionaryvalidation/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand
+++ b/dictionaryvalidation/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.onap.validation.rule.PMDictionaryValidate
+org.onap.validation.rule.DictionaryValidate
diff --git a/pmdictionaryvalidation/src/main/resources/log4j2.properties b/dictionaryvalidation/src/main/resources/log4j2.properties
index c7e5092..8ef4de1 100644
--- a/pmdictionaryvalidation/src/main/resources/log4j2.properties
+++ b/dictionaryvalidation/src/main/resources/log4j2.properties
@@ -20,7 +20,7 @@ status = error
 dest = err
 name = PropertiesConfig
 
-property.filename = ./pmdictionary-validate.log
+property.filename = ./dictionary-validate.log
 
 filter.threshold.type = ThresholdFilter
 filter.threshold.level = debug
@@ -35,7 +35,7 @@ appender.console.filter.threshold.level = error
 appender.rolling.type = RollingFile
 appender.rolling.name = RollingFile
 appender.rolling.fileName = ${filename}
-appender.rolling.filePattern = ./pmdictionary-validate.%d{yyyy-MM-dd-HH:mm:ss}.log
+appender.rolling.filePattern = ./dictionary-validate.%d{yyyy-MM-dd-HH:mm:ss}.log
 appender.rolling.layout.type = PatternLayout
 appender.rolling.layout.pattern = %d %p %C{1.} [%t] %m%n
 appender.rolling.policies.type = Policies
diff --git a/pmdictionaryvalidation/src/main/resources/open-cli-schema/pm-dictionary-validate.yaml b/dictionaryvalidation/src/main/resources/open-cli-schema/dictionary-validate.yaml
index b779361..1f5801d 100644
--- a/pmdictionaryvalidation/src/main/resources/open-cli-schema/pm-dictionary-validate.yaml
+++ b/dictionaryvalidation/src/main/resources/open-cli-schema/dictionary-validate.yaml
@@ -14,9 +14,9 @@
 
 open_cli_schema_version: 1.0
 
-name: pm-dictionary-validate
+name: dictionary-validate
 
-description: Validate PM Dictionary Yaml file
+description: Validate Dictionary Yaml file
 
 info:
   product: onap-honolulu
@@ -36,7 +36,7 @@ results:
     direction: portrait
     attributes:
      - name: file
-       description: PM Dictionary Yaml file
+       description: Dictionary Yaml file
        scope: short
        type: string
      - name: date
@@ -47,7 +47,7 @@ results:
        description: Platform used to test the reqs
        scope: short
        type: string
-       default_value: PM Dictionary Test Platform (VTP) 1.0
+       default_value: Dictionary Test Platform (VTP) 1.0
      - name: contact
        description: Owner for this test case
        scope: short
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/functional/PmDictionaryValidateRuleFunctionalTest.java b/dictionaryvalidation/src/test/java/org/onap/functional/DictionaryValidateRuleFunctionalTest.java
index fc212e7..2d2c542 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/functional/PmDictionaryValidateRuleFunctionalTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/functional/DictionaryValidateRuleFunctionalTest.java
@@ -18,8 +18,8 @@ package org.onap.functional;
 
 import org.junit.Test;
 import org.onap.functional.util.OnapCliWrapper;
-import org.onap.validation.rule.PMDictionaryValidate;
-import org.onap.validation.rule.PMDictionaryValidateResponse;
+import org.onap.validation.rule.DictionaryValidate;
+import org.onap.validation.rule.DictionaryValidateResponse;
 
 import java.net.URISyntaxException;
 
@@ -31,10 +31,12 @@ import static org.onap.functional.util.ValidationUtility.verifyThatOperationFini
 import static org.onap.functional.util.ValidationUtility.verifyThatOperationFinishedWithoutAnyError;
 
 
-public class PmDictionaryValidateRuleFunctionalTest {
+public class DictionaryValidateRuleFunctionalTest {
 
 
     private static final String YAML_SCHEMA_SIMPLE_VALID_SCHEMA_YAML = "yaml_schema/Simple_Valid_Schema.yaml";
+    private static final String YAML_CUSTOM_SCHEMA_SIMPLE_VALID_SCHEMA_YAML = "yaml_schema/Custom_Valid_Dictionary.yaml";
+    private static final String YAML_CUSTOM_SCHEMA_SIMPLE_INVALID_SCHEMA_YAML = "yaml_schema/Custom_Invalid_Dictionary.yaml";
     private static final String NO_ERRORS = "[]";
     private static final String YAML_SCHEMA_PM_DICTIONARY_YAML = "yaml_schema/PM_Dictionary.yaml";
     private static final String PATH_TO_NON_EXITING_FILE_YAML = "path/to/nonExitingFile.yaml";
@@ -49,17 +51,60 @@ public class PmDictionaryValidateRuleFunctionalTest {
         cli.handle();
 
         // then
-        final PMDictionaryValidateResponse result = getCliCommandValidationResult(cli, PMDictionaryValidateResponse.class);
+        final DictionaryValidateResponse result = getCliCommandValidationResult(cli, DictionaryValidateResponse.class);
 
         assertThat(result.getFile()).contains(YAML_SCHEMA_SIMPLE_VALID_SCHEMA_YAML);
-        assertThat(result.getPlatform()).contains(PMDictionaryValidateResponse.PLATFORM_VTP_1_0);
-        assertThat(result.getContact()).contains(PMDictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG);
+        assertThat(result.getPlatform()).contains(DictionaryValidateResponse.PLATFORM_VTP_1_0);
+        assertThat(result.getContact()).contains(DictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG);
         assertThat(result.getCriteria()).isEqualTo(OPERATION_STATUS_PASS);
         assertThat(result.getErrors()).isEqualTo(NO_ERRORS);
         verifyThatOperationFinishedWithoutAnyError(cli);
     }
 
     @Test
+    public void shouldSuccessfullyValidateCustomDictionaryYamlFile() throws URISyntaxException {
+        // given
+        OnapCliWrapper cli = new OnapCliWrapper(createPnfValidationRequestInfo(YAML_CUSTOM_SCHEMA_SIMPLE_VALID_SCHEMA_YAML));
+
+        // when
+        cli.handle();
+
+        // then
+        final DictionaryValidateResponse result = getCliCommandValidationResult(cli, DictionaryValidateResponse.class);
+
+        assertThat(result.getFile()).contains(YAML_CUSTOM_SCHEMA_SIMPLE_VALID_SCHEMA_YAML);
+        assertThat(result.getPlatform()).contains(DictionaryValidateResponse.PLATFORM_VTP_1_0);
+        assertThat(result.getContact()).contains(DictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG);
+        assertThat(result.getCriteria()).isEqualTo(OPERATION_STATUS_PASS);
+        verifyThatOperationFinishedWithoutAnyError(cli);
+    }
+
+    @Test
+    public void shouldFailWhileValidatingCustomDictionaryYamlFileWithEerror() throws URISyntaxException {
+        // given
+        OnapCliWrapper cli = new OnapCliWrapper(createPnfValidationRequestInfo(YAML_CUSTOM_SCHEMA_SIMPLE_INVALID_SCHEMA_YAML));
+
+        // when
+        cli.handle();
+
+        // then
+        final DictionaryValidateResponse result = getCliCommandValidationResult(cli, DictionaryValidateResponse.class);
+
+        assertThat(result.getFile()).contains(YAML_CUSTOM_SCHEMA_SIMPLE_INVALID_SCHEMA_YAML);
+        assertThat(result.getPlatform()).contains(DictionaryValidateResponse.PLATFORM_VTP_1_0);
+        assertThat(result.getContact()).contains(DictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG);
+        assertThat(result.getCriteria()).isEqualTo(OPERATION_STATUS_FAILED);
+        final String errors = result.getErrors();
+        assertThat(errors).contains(
+            "Value(s) is/are not in array of accepted values.",
+            "accepted value(s):  [X, Y, Z]",
+            "accepted value(s):  [3, 30, 33]",
+            "Key not found: field2"
+        );
+        verifyThatOperationFinishedWithoutAnyError(cli);
+    }
+
+    @Test
     public void shouldFailsWhenPMDictionaryYamlFileHasSomeErrors() throws URISyntaxException {
         // given
         OnapCliWrapper cli = new OnapCliWrapper(createPnfValidationRequestInfo(YAML_SCHEMA_PM_DICTIONARY_YAML));
@@ -68,11 +113,11 @@ public class PmDictionaryValidateRuleFunctionalTest {
         cli.handle();
 
         // then
-        final PMDictionaryValidateResponse result = getCliCommandValidationResult(cli, PMDictionaryValidateResponse.class);
+        final DictionaryValidateResponse result = getCliCommandValidationResult(cli, DictionaryValidateResponse.class);
 
         assertThat(result.getFile()).contains(YAML_SCHEMA_PM_DICTIONARY_YAML);
-        assertThat(result.getPlatform()).contains(PMDictionaryValidateResponse.PLATFORM_VTP_1_0);
-        assertThat(result.getContact()).contains(PMDictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG);
+        assertThat(result.getPlatform()).contains(DictionaryValidateResponse.PLATFORM_VTP_1_0);
+        assertThat(result.getContact()).contains(DictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG);
         assertThat(result.getCriteria()).isEqualTo(OPERATION_STATUS_FAILED);
         final String errors = result.getErrors();
         assertThat(errors).contains(
@@ -105,11 +150,11 @@ public class PmDictionaryValidateRuleFunctionalTest {
         cli.handle();
 
         // then
-        final PMDictionaryValidateResponse result = getCliCommandValidationResult(cli, PMDictionaryValidateResponse.class);
+        final DictionaryValidateResponse result = getCliCommandValidationResult(cli, DictionaryValidateResponse.class);
 
         assertThat(result.getFile()).contains(NOT_YAML_FILE_TXT);
-        assertThat(result.getPlatform()).contains(PMDictionaryValidateResponse.PLATFORM_VTP_1_0);
-        assertThat(result.getContact()).contains(PMDictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG);
+        assertThat(result.getPlatform()).contains(DictionaryValidateResponse.PLATFORM_VTP_1_0);
+        assertThat(result.getContact()).contains(DictionaryValidateResponse.ONAP_DISCUSS_LISTS_ONAP_ORG);
         assertThat(result.getCriteria()).isEqualTo(OPERATION_STATUS_FAILED);
         assertThat(result.getErrors()).contains("Provided yaml file has invalid structure!");
         verifyThatOperationFinishedWithoutAnyError(cli);
@@ -119,7 +164,7 @@ public class PmDictionaryValidateRuleFunctionalTest {
     private String[] createPnfValidationRequestInfo(String yamlPath) throws URISyntaxException {
         return new String[]{
                 "--product", "onap-honolulu",
-                "pm-dictionary-validate",
+                "dictionary-validate",
                 "--format", "json",
                 "--yaml", absoluteFilePath(yamlPath)
         };
@@ -127,7 +172,7 @@ public class PmDictionaryValidateRuleFunctionalTest {
 
 
     public static String absoluteFilePath(String relativeFilePath) throws URISyntaxException {
-        return PMDictionaryValidate.class.getClassLoader().getResource(relativeFilePath)
+        return DictionaryValidate.class.getClassLoader().getResource(relativeFilePath)
                 .toURI().getPath();
     }
 }
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/functional/util/OnapCliWrapper.java b/dictionaryvalidation/src/test/java/org/onap/functional/util/OnapCliWrapper.java
index 347a7bb..347a7bb 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/functional/util/OnapCliWrapper.java
+++ b/dictionaryvalidation/src/test/java/org/onap/functional/util/OnapCliWrapper.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/functional/util/ValidationUtility.java b/dictionaryvalidation/src/test/java/org/onap/functional/util/ValidationUtility.java
index 3a497f4..3a497f4 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/functional/util/ValidationUtility.java
+++ b/dictionaryvalidation/src/test/java/org/onap/functional/util/ValidationUtility.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/MainCITest.java b/dictionaryvalidation/src/test/java/org/onap/validation/cli/MainCITest.java
index 307d388..307d388 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/MainCITest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/cli/MainCITest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/OutputFilePathGeneratorTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/OutputFilePathGeneratorTest.java
index b4d68b4..b4d68b4 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/OutputFilePathGeneratorTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/OutputFilePathGeneratorTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/ToJsonConverterTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/ToJsonConverterTest.java
index 06a15bb..06a15bb 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/ToJsonConverterTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/ToJsonConverterTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/ValidateYamlCommandTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/ValidateYamlCommandTest.java
index 44622db..9d651ad 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/ValidateYamlCommandTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/cli/command/validate/ValidateYamlCommandTest.java
@@ -35,11 +35,11 @@ import static org.onap.validation.cli.command.validate.ToResponseModelConverter.
 class ValidateYamlCommandTest {
 
     private final ToJsonConverter toJsonConverter = new ToJsonConverter();
-    private ValidatePmDictionaryYamlCommand validateYamlCommand;
+    private ValidateDictionaryYamlCommand validateYamlCommand;
 
     @BeforeEach
     void setUp() {
-        this.validateYamlCommand = new ValidatePmDictionaryYamlCommand(toJsonConverter);
+        this.validateYamlCommand = new ValidateDictionaryYamlCommand(toJsonConverter);
     }
 
     @Test
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/core/CliTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/cli/core/CliTest.java
index c8ad629..c8ad629 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/cli/core/CliTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/cli/core/CliTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlContentValidatorTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlContentValidatorTest.java
index 1412085..ff4e55b 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlContentValidatorTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlContentValidatorTest.java
@@ -81,7 +81,7 @@ class YamlContentValidatorTest {
             //when then
             assertThatThrownBy(() -> yamlContentValidator.validate(path))
                     .isInstanceOf(YamlProcessingException.class)
-                    .hasMessageContaining("PM_Dictionary YAML file is empty");
+                    .hasMessageContaining("Dictionary YAML file is empty");
         }
     }
 
@@ -127,7 +127,7 @@ class YamlContentValidatorTest {
             //when then
             assertThatThrownBy(() -> new YamlContentValidator().validate(new byte[0]))
                     .isInstanceOf(YamlProcessingException.class)
-                    .hasMessageContaining("PM_Dictionary YAML file is empty");
+                    .hasMessageContaining("Dictionary YAML file is empty");
         }
     }
 
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
index 3e1f601..3e1f601 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoadingUtils.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoadingUtils.java
index dc1ce3b..dc1ce3b 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoadingUtils.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoadingUtils.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlValidatorTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlValidatorTest.java
index 3d993f8..3d993f8 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlValidatorTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlValidatorTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlDocumentFactoryTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlDocumentFactoryTest.java
index d7d1153..d7d1153 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlDocumentFactoryTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlDocumentFactoryTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlParameterListFactoryTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlParameterListFactoryTest.java
index ab6f882..ab6f882 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlParameterListFactoryTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/model/YamlParameterListFactoryTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/process/YamlValidationProcessTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/process/YamlValidationProcessTest.java
index 5c9d8e5..5c9d8e5 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/process/YamlValidationProcessTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/process/YamlValidationProcessTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/YamlSchemaFactoryTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/YamlSchemaFactoryTest.java
index efc304c..efc304c 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/YamlSchemaFactoryTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/YamlSchemaFactoryTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactoryTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactoryTest.java
index 646b8a2..646b8a2 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactoryTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/schema/node/YamlSchemaNodeFactoryTest.java
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/util/ArgsTest.java b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/util/ArgsTest.java
index 0090683..0090683 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/util/ArgsTest.java
+++ b/dictionaryvalidation/src/test/java/org/onap/validation/yaml/util/ArgsTest.java
diff --git a/pmdictionaryvalidation/src/test/resources/Not_Yaml_File.txt b/dictionaryvalidation/src/test/resources/Not_Yaml_File.txt
index be6ee44..be6ee44 100644
--- a/pmdictionaryvalidation/src/test/resources/Not_Yaml_File.txt
+++ b/dictionaryvalidation/src/test/resources/Not_Yaml_File.txt
diff --git a/dictionaryvalidation/src/test/resources/yaml_schema/Custom_Invalid_Dictionary.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Custom_Invalid_Dictionary.yaml
new file mode 100644
index 0000000..d5d12d6
--- /dev/null
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Custom_Invalid_Dictionary.yaml
@@ -0,0 +1,56 @@
+---
+rootElement: { presence: required, structure: {
+  field1: {
+    presence: required,
+    comment: "field 1 description",
+    structure: {
+      field11:{
+        presence: required,
+        comment: "field 11 description"
+      },
+      field12: {
+        presence: required,
+        comment: "field 12 description"
+      },
+      field13: {
+        presence: optional,
+        value: [ X, Y, Z ],
+        comment: "field 13 description"
+      }
+    }
+  },
+  field2: {
+    presence: required,
+    comment: "field 2 description"
+  },
+  field3: {
+    presence: required,
+    value: [ 3, 30, 33 ],
+    comment: "field 2 description"
+  }
+}}
+...
+---
+rootElement:
+  field1:
+    field11: test11
+    field12: test12
+    field13: A
+  field2: test2
+  field3: 3
+...
+---
+rootElement:
+  field1:
+    field11: test11
+    field12: test12
+  field2: test2
+  field3: 300
+...
+---
+rootElement:
+  field1:
+    field11: test11
+    field12: test12
+  field3: 3
+...
diff --git a/dictionaryvalidation/src/test/resources/yaml_schema/Custom_Valid_Dictionary.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Custom_Valid_Dictionary.yaml
new file mode 100644
index 0000000..4193b0d
--- /dev/null
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Custom_Valid_Dictionary.yaml
@@ -0,0 +1,58 @@
+---
+rootElement1: { presence: required, structure: {
+  field11: {
+    presence: required,
+    value: [X, Y, Z],
+    comment: "field 11 description"
+  },
+  field12: {
+    presence: required,
+    comment: "field 12 description"
+  }
+}}
+rootElement2: { presence: required, structure: {
+  field21: {
+    presence: required,
+    value: [22, 222, 2222],
+    comment: "field 21 description"
+  },
+  field22: {
+    presence: optional,
+    value: [ A,B,C ],
+    comment: "field 22 description"
+  }
+}}
+rootElement3: { presence: optional, structure: {
+  field3: {
+    presence: required,
+    comment: "field 3 description"
+  }
+}}
+...
+---
+rootElement1:
+  field11: X
+  field12: test
+rootElement2:
+  field21: 22
+  field22: B
+...
+---
+rootElement1:
+  field11: X
+  field12: test12
+rootElement2:
+  field21: 22
+rootElement3:
+  field3: test3
+...
+---
+rootElement1:
+  field11: Y
+  field12: testing12
+rootElement2:
+  field21: 222
+  field22: A
+rootElement3:
+  field3: testing3
+...
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/Multi_Document_Invalid.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Multi_Document_Invalid.yaml
index aab34fa..aab34fa 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/Multi_Document_Invalid.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Multi_Document_Invalid.yaml
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary.yaml
index 12a4af9..12a4af9 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary.yaml
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary_JSON_Style.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary_JSON_Style.yaml
index f4cbddf..f4cbddf 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary_JSON_Style.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/PM_Dictionary_JSON_Style.yaml
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Mapping_Value.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Mapping_Value.yaml
index 25c72cd..25c72cd 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Mapping_Value.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Mapping_Value.yaml
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_Construction.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_Construction.yaml
index c5e7b7c..c5e7b7c 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_Construction.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_Construction.yaml
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_LazyLoading.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_LazyLoading.yaml
index 7f9f946..7f9f946 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_LazyLoading.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Invalid_Schema_LazyLoading.yaml
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Unknown_Escape_Character.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Unknown_Escape_Character.yaml
index 2cac9e6..2cac9e6 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Unknown_Escape_Character.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Unknown_Escape_Character.yaml
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema.yaml
index a125b13..a125b13 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema.yaml
diff --git a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema_Multi_Root.yaml b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema_Multi_Root.yaml
index d73ca4f..d73ca4f 100644
--- a/pmdictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema_Multi_Root.yaml
+++ b/dictionaryvalidation/src/test/resources/yaml_schema/Simple_Valid_Schema_Multi_Root.yaml
diff --git a/pom.xml b/pom.xml
index 56a65d6..1415928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     <modules>
         <module>csarvalidation</module>
         <module>deployment</module>
-        <module>pmdictionaryvalidation</module>
+        <module>dictionaryvalidation</module>
     </modules>
 
     <build>