Revert "Renaming Files having BluePrint to have Blueprint"

The renaming in CCSDK-3098 caused breaking changes to the grpc api and
compile issues for kotlin scripts.

Issue-ID: CCSDK-3385
Change-Id: I0d745cb858371678eabcb2284671c1fd76a1ab6d
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>

15 files changed, 112 insertions, 112 deletions

diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingGRPCHandler.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandler.kt
index 98577db26..79106c24a 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingGRPCHandler.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandler.kt
@@ -20,10 +20,10 @@ package org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api
 import io.grpc.Status
 import io.grpc.stub.StreamObserver
 import kotlinx.coroutines.runBlocking
-import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintCoreConfiguration
+import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintCoreConfiguration
 import org.onap.ccsdk.cds.blueprintsprocessor.core.utils.toJava
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException
-import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
+import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput
 import org.onap.ccsdk.cds.error.catalog.core.ErrorCatalogCodes
@@ -37,14 +37,14 @@ import java.util.concurrent.Phaser
 import javax.annotation.PreDestroy
 
 @Service
-open class BlueprintProcessingGRPCHandler(
-    private val bluePrintCoreConfiguration: BlueprintCoreConfiguration,
+open class BluePrintProcessingGRPCHandler(
+    private val bluePrintCoreConfiguration: BluePrintCoreConfiguration,
     private val executionServiceHandler: ExecutionServiceHandler,
     private val errorCatalogService: ErrorCatalogService
 ) :
-    BlueprintProcessingServiceGrpc.BlueprintProcessingServiceImplBase() {
+    BluePrintProcessingServiceGrpc.BluePrintProcessingServiceImplBase() {
 
-    private val log = LoggerFactory.getLogger(BlueprintProcessingGRPCHandler::class.java)
+    private val log = LoggerFactory.getLogger(BluePrintProcessingGRPCHandler::class.java)
 
     private val ph = Phaser(1)
 
@@ -69,7 +69,7 @@ open class BlueprintProcessingGRPCHandler(
 
             override fun onError(error: Throwable) {
                 log.debug("Fail to process message", error)
-                if (error is BlueprintProcessorException) onErrorCatalog(error) else onError(error)
+                if (error is BluePrintProcessorException) onErrorCatalog(error) else onError(error)
             }
 
             fun onError(error: Exception) {
@@ -81,7 +81,7 @@ open class BlueprintProcessingGRPCHandler(
                 )
             }
 
-            fun onErrorCatalog(error: BlueprintProcessorException) {
+            fun onErrorCatalog(error: BluePrintProcessorException) {
                 if (error.protocol == "") {
                     error.grpc(ErrorCatalogCodes.GENERIC_FAILURE)
                 }
@@ -103,7 +103,7 @@ open class BlueprintProcessingGRPCHandler(
 
     @PreDestroy
     fun preDestroy() {
-        val name = "BlueprintProcessingGRPCHandler"
+        val name = "BluePrintProcessingGRPCHandler"
         log.info("Starting to shutdown $name waiting for in-flight requests to finish ...")
         ph.arriveAndAwaitAdvance()
         log.info("Done waiting in $name")
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingKafkaConsumer.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt
index 82fd78efe..ed9b4d57e 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingKafkaConsumer.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumer.kt
@@ -24,10 +24,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
 import org.onap.ccsdk.cds.blueprintsprocessor.message.BlueprintMessageMetricConstants
-import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BlueprintMessageLibPropertyService
+import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BluePrintMessageLibPropertyService
 import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BlueprintMessageConsumerService
 import org.onap.ccsdk.cds.blueprintsprocessor.message.utils.BlueprintMessageUtils
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintProcessorException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException
 import org.onap.ccsdk.cds.controllerblueprints.core.jsonAsType
 import org.onap.ccsdk.cds.controllerblueprints.core.logger
 import org.onap.ccsdk.cds.controllerblueprints.core.updateErrorMessage
@@ -45,13 +45,13 @@ import javax.annotation.PreDestroy
     havingValue = "true"
 )
 @Service
-open class BlueprintProcessingKafkaConsumer(
-    private val blueprintMessageLibPropertyService: BlueprintMessageLibPropertyService,
+open class BluePrintProcessingKafkaConsumer(
+    private val blueprintMessageLibPropertyService: BluePrintMessageLibPropertyService,
     private val executionServiceHandler: ExecutionServiceHandler,
     private val meterRegistry: MeterRegistry
 ) {
 
-    val log = logger(BlueprintProcessingKafkaConsumer::class)
+    val log = logger(BluePrintProcessingKafkaConsumer::class)
 
     private val ph = Phaser(1)
 
@@ -75,28 +75,28 @@ open class BlueprintProcessingKafkaConsumer(
             blueprintMessageConsumerService = try {
                 blueprintMessageLibPropertyService
                     .blueprintMessageConsumerService(CONSUMER_SELECTOR)
-            } catch (e: BlueprintProcessorException) {
+            } catch (e: BluePrintProcessorException) {
                 val errorMsg = "Failed creating Kafka consumer message service."
                 throw e.updateErrorMessage(
                     SelfServiceApiDomains.SELF_SERVICE_API, errorMsg,
                     "Wrong Kafka selector provided or internal error in Kafka service."
                 )
             } catch (e: Exception) {
-                throw BlueprintProcessorException("failed to create consumer service ${e.message}")
+                throw BluePrintProcessorException("failed to create consumer service ${e.message}")
             }
 
             /** Get the Message Producer Service **/
             val blueprintMessageProducerService = try {
                 blueprintMessageLibPropertyService
                     .blueprintMessageProducerService(PRODUCER_SELECTOR)
-            } catch (e: BlueprintProcessorException) {
+            } catch (e: BluePrintProcessorException) {
                 val errorMsg = "Failed creating Kafka producer message service."
                 throw e.updateErrorMessage(
                     SelfServiceApiDomains.SELF_SERVICE_API, errorMsg,
                     "Wrong Kafka selector provided or internal error in Kafka service."
                 )
             } catch (e: Exception) {
-                throw BlueprintProcessorException("failed to create producer service ${e.message}")
+                throw BluePrintProcessorException("failed to create producer service ${e.message}")
             }
 
             launch {
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt
index 6c6c26c43..bb7ecc6ad 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceController.kt
@@ -27,11 +27,11 @@ import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceOutp
 import org.onap.ccsdk.cds.blueprintsprocessor.core.cluster.optionalClusterService
 import org.onap.ccsdk.cds.blueprintsprocessor.rest.service.mdcWebCoroutineScope
 import org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.utils.determineHttpStatusCode
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.asJsonType
 import org.onap.ccsdk.cds.controllerblueprints.core.httpProcessorException
 import org.onap.ccsdk.cds.controllerblueprints.core.logger
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BlueprintDependencyService
+import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintDependencyService
 import org.onap.ccsdk.cds.error.catalog.core.ErrorCatalogCodes
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.MediaType
@@ -70,8 +70,8 @@ open class ExecutionServiceController {
     suspend fun executionServiceControllerHealthCheck(): ResponseEntity<JsonNode> = mdcWebCoroutineScope {
         var body = mutableMapOf("success" to true)
         var statusCode = 200
-        if (BlueprintConstants.CLUSTER_ENABLED &&
-            BlueprintDependencyService.optionalClusterService()?.clusterJoined() != true
+        if (BluePrintConstants.CLUSTER_ENABLED &&
+            BluePrintDependencyService.optionalClusterService()?.clusterJoined() != true
         ) {
             statusCode = 503
             body.remove("success")
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandler.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandler.kt
index 8c958c4b4..e604987a7 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandler.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandler.kt
@@ -34,21 +34,21 @@ import org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.SelfServiceMetricC
 import org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.utils.cbaMetricTags
 import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractServiceFunction
 import org.onap.ccsdk.cds.controllerblueprints.common.api.EventType
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.config.BlueprintLoadConfiguration
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintCatalogService
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintWorkflowExecutionService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BlueprintDependencyService
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.BlueprintMetadataUtils
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.config.BluePrintLoadConfiguration
+import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintCatalogService
+import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintWorkflowExecutionService
+import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintDependencyService
+import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintMetadataUtils
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
 @Service
 class ExecutionServiceHandler(
-    private val bluePrintLoadConfiguration: BlueprintLoadConfiguration,
-    private val blueprintsProcessorCatalogService: BlueprintCatalogService,
+    private val bluePrintLoadConfiguration: BluePrintLoadConfiguration,
+    private val blueprintsProcessorCatalogService: BluePrintCatalogService,
     private val bluePrintWorkflowExecutionService:
-        BlueprintWorkflowExecutionService<ExecutionServiceInput, ExecutionServiceOutput>,
+        BluePrintWorkflowExecutionService<ExecutionServiceInput, ExecutionServiceOutput>,
     private val publishAuditService: PublishAuditService,
     private val meterRegistry: MeterRegistry
 ) {
@@ -111,14 +111,14 @@ class ExecutionServiceHandler(
                 val basePath = blueprintsProcessorCatalogService.getFromDatabase(blueprintName, blueprintVersion)
                 log.info("blueprint base path $basePath")
 
-                val blueprintRuntimeService = BlueprintMetadataUtils.getBlueprintRuntime(requestId, basePath.toString())
+                val blueprintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime(requestId, basePath.toString())
 
-                executionServiceOutput = bluePrintWorkflowExecutionService.executeBlueprintWorkflow(
+                executionServiceOutput = bluePrintWorkflowExecutionService.executeBluePrintWorkflow(
                     blueprintRuntimeService,
                     executionServiceInput, hashMapOf()
                 )
 
-                val errors = blueprintRuntimeService.getBlueprintError().allErrors()
+                val errors = blueprintRuntimeService.getBluePrintError().allErrors()
                 if (errors.isNotEmpty()) {
                     setErrorStatus(errors.joinToString(", "), executionServiceOutput.status)
                 }
@@ -144,7 +144,7 @@ class ExecutionServiceHandler(
     /** If no blueprint is needed, then get the Service function instance mapping to the action name and execute it */
     suspend fun executeServiceFunction(executionServiceInput: ExecutionServiceInput): ExecutionServiceOutput {
         val actionName = executionServiceInput.actionIdentifiers.actionName
-        val instance = BlueprintDependencyService.instance<AbstractServiceFunction>(actionName)
+        val instance = BluePrintDependencyService.instance<AbstractServiceFunction>(actionName)
         checkNotNull(instance) { "failed to initialize service function($actionName)" }
         instance.actionName = actionName
         return instance.applyNB(executionServiceInput)
@@ -154,7 +154,7 @@ class ExecutionServiceHandler(
         status.errorMessage = errorMessage
         status.eventType = EventType.EVENT_COMPONENT_FAILURE.name
         status.code = 500
-        status.message = BlueprintConstants.STATUS_FAILURE
+        status.message = BluePrintConstants.STATUS_FAILURE
     }
 
     private fun response(
@@ -173,7 +173,7 @@ class ExecutionServiceHandler(
         } else {
             status.eventType = EventType.EVENT_COMPONENT_PROCESSING.name
             status.code = 200
-            status.message = BlueprintConstants.STATUS_PROCESSING
+            status.message = BluePrintConstants.STATUS_PROCESSING
         }
 
         executionServiceOutput.status = status
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
index 46befee8a..ce407bc8c 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
@@ -22,16 +22,16 @@ import com.fasterxml.jackson.databind.node.ObjectNode
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceOutput
 import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.ResourceResolutionConstants
-import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BlueprintMessageLibPropertyService
+import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BluePrintMessageLibPropertyService
 import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BlueprintMessageProducerService
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive
 import org.onap.ccsdk.cds.controllerblueprints.core.common.ApplicationConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintCatalogService
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BlueprintContext
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BlueprintRuntimeService
+import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintCatalogService
+import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintContext
+import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService
 import org.onap.ccsdk.cds.controllerblueprints.core.service.PropertyAssignmentService
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.BlueprintMetadataUtils
+import org.onap.ccsdk.cds.controllerblueprints.core.utils.BluePrintMetadataUtils
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.PropertyDefinitionUtils
 import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment
@@ -57,8 +57,8 @@ import javax.annotation.PostConstruct
 )
 @Service
 class KafkaPublishAuditService(
-    private val bluePrintMessageLibPropertyService: BlueprintMessageLibPropertyService,
-    private val blueprintsProcessorCatalogService: BlueprintCatalogService
+    private val bluePrintMessageLibPropertyService: BluePrintMessageLibPropertyService,
+    private val blueprintsProcessorCatalogService: BluePrintCatalogService
 ) : PublishAuditService {
 
     private var inputInstance: BlueprintMessageProducerService? = null
@@ -166,7 +166,7 @@ class KafkaPublishAuditService(
 
                 val basePath = blueprintsProcessorCatalogService.getFromDatabase(blueprintName, blueprintVersion)
 
-                val blueprintRuntimeService = BlueprintMetadataUtils.getBlueprintRuntime(requestId, basePath.toString())
+                val blueprintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime(requestId, basePath.toString())
                 val blueprintContext = blueprintRuntimeService.bluePrintContext()
 
                 blueprintContext.workflowSteps(workflowName).forEach { step ->
@@ -175,9 +175,9 @@ class KafkaPublishAuditService(
                     val nodeTemplate = blueprintContext.nodeTemplateByName(nodeTemplateName)
 
                     /** We need to check in his Node Template Dependencies is case of a Node Template DG */
-                    if (nodeTemplate.type == BlueprintConstants.NODE_TEMPLATE_TYPE_DG) {
+                    if (nodeTemplate.type == BluePrintConstants.NODE_TEMPLATE_TYPE_DG) {
                         val dependencyNodeTemplate =
-                            nodeTemplate.properties?.get(BlueprintConstants.PROPERTY_DG_DEPENDENCY_NODE_TEMPLATE) as ArrayNode
+                            nodeTemplate.properties?.get(BluePrintConstants.PROPERTY_DG_DEPENDENCY_NODE_TEMPLATE) as ArrayNode
                         dependencyNodeTemplate.forEach { dependencyNodeTemplateName ->
                             clonedExecutionServiceInput = hideSensitiveDataFromResourceResolution(
                                 blueprintRuntimeService,
@@ -220,15 +220,15 @@ class KafkaPublishAuditService(
      * @return [executionServiceInput] with sensitive inputs replaced by a generic string
      */
     private suspend fun hideSensitiveDataFromResourceResolution(
-        blueprintRuntimeService: BlueprintRuntimeService<MutableMap<String, JsonNode>>,
-        blueprintContext: BlueprintContext,
+        blueprintRuntimeService: BluePrintRuntimeService<MutableMap<String, JsonNode>>,
+        blueprintContext: BluePrintContext,
         executionServiceInput: ExecutionServiceInput,
         workflowName: String,
         nodeTemplateName: String
     ): ExecutionServiceInput {
 
         val nodeTemplate = blueprintContext.nodeTemplateByName(nodeTemplateName)
-        if (nodeTemplate.type == BlueprintConstants.NODE_TEMPLATE_TYPE_COMPONENT_RESOURCE_RESOLUTION) {
+        if (nodeTemplate.type == BluePrintConstants.NODE_TEMPLATE_TYPE_COMPONENT_RESOURCE_RESOLUTION) {
             val interfaceName = blueprintContext.nodeTemplateFirstInterfaceName(nodeTemplateName)
             val operationName = blueprintContext.nodeTemplateFirstInterfaceFirstOperationName(nodeTemplateName)
 
@@ -242,7 +242,7 @@ class KafkaPublishAuditService(
             val artifactPrefixNamesNode = propertyAssignments[ResourceResolutionConstants.INPUT_ARTIFACT_PREFIX_NAMES]
             val propertyAssignmentService = PropertyAssignmentService(blueprintRuntimeService)
             val artifactPrefixNamesNodeValue = propertyAssignmentService.resolveAssignmentExpression(
-                BlueprintConstants.MODEL_DEFINITION_TYPE_NODE_TEMPLATE,
+                BluePrintConstants.MODEL_DEFINITION_TYPE_NODE_TEMPLATE,
                 nodeTemplateName,
                 ResourceResolutionConstants.INPUT_ARTIFACT_PREFIX_NAMES,
                 artifactPrefixNamesNode!!
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BlueprintProcessingUtils.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BlueprintProcessingUtils.kt
index c04410a2f..17f7722c4 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BlueprintProcessingUtils.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BlueprintProcessingUtils.kt
@@ -18,8 +18,8 @@ package org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.utils
 import io.micrometer.core.instrument.Tag
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceOutput
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintException
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintException
 import org.springframework.http.HttpStatus
 import org.springframework.http.codec.multipart.FilePart
 import org.springframework.util.StringUtils
@@ -30,13 +30,13 @@ import java.util.UUID
 
 const val INTERNAL_SERVER_ERROR_HTTP_STATUS_CODE = 500
 
-@Throws(BlueprintException::class, IOException::class)
+@Throws(BluePrintException::class, IOException::class)
 fun saveCBAFile(filePart: FilePart, targetDirectory: Path): Path {
 
     val fileName = StringUtils.cleanPath(filePart.filename())
 
     if (StringUtils.getFilenameExtension(fileName) != "zip") {
-        throw BlueprintException("Invalid file extension required ZIP")
+        throw BluePrintException("Invalid file extension required ZIP")
     }
 
     val changedFileName = UUID.randomUUID().toString() + ".zip"
@@ -68,19 +68,19 @@ fun determineHttpStatusCode(statusCode: Int): HttpStatus {
 fun cbaMetricTags(executionServiceInput: ExecutionServiceInput): MutableList<Tag> =
     executionServiceInput.actionIdentifiers.let {
         mutableListOf(
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_NAME, it.blueprintName),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_VERSION, it.blueprintVersion),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_ACTION, it.actionName)
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_NAME, it.blueprintName),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_VERSION, it.blueprintVersion),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_ACTION, it.actionName)
         )
     }
 
 fun cbaMetricTags(executionServiceOutput: ExecutionServiceOutput): MutableList<Tag> =
     executionServiceOutput.let {
         mutableListOf(
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_NAME, it.actionIdentifiers.blueprintName),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_VERSION, it.actionIdentifiers.blueprintVersion),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_ACTION, it.actionIdentifiers.actionName),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_STATUS, it.status.code.toString()),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_OUTCOME, it.status.message)
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_NAME, it.actionIdentifiers.blueprintName),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_VERSION, it.actionIdentifiers.blueprintVersion),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_ACTION, it.actionIdentifiers.actionName),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_STATUS, it.status.code.toString()),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_OUTCOME, it.status.message)
         )
     }
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/validation/BlueprintRuntimeValidatorService.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/validation/BluePrintRuntimeValidatorService.kt
index 23d4bf012..ff615536b 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/validation/BlueprintRuntimeValidatorService.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/validation/BluePrintRuntimeValidatorService.kt
@@ -16,14 +16,14 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.validation
 
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintTypeValidatorService
-import org.onap.ccsdk.cds.controllerblueprints.validation.BlueprintDesignTimeValidatorService
+import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintTypeValidatorService
+import org.onap.ccsdk.cds.controllerblueprints.validation.BluePrintDesignTimeValidatorService
 import org.onap.ccsdk.cds.controllerblueprints.validation.extension.ResourceDefinitionValidator
 import org.springframework.stereotype.Service
 
 @Service("bluePrintRuntimeValidatorService")
-open class BlueprintRuntimeValidatorService(
-    bluePrintTypeValidatorService: BlueprintTypeValidatorService,
+open class BluePrintRuntimeValidatorService(
+    bluePrintTypeValidatorService: BluePrintTypeValidatorService,
     resourceDefinitionValidator: ResourceDefinitionValidator
 ) :
-    BlueprintDesignTimeValidatorService(bluePrintTypeValidatorService, resourceDefinitionValidator)
+    BluePrintDesignTimeValidatorService(bluePrintTypeValidatorService, resourceDefinitionValidator)
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingGRPCHandlerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandlerTest.kt
index 3033103e3..0d79368ad 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingGRPCHandlerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingGRPCHandlerTest.kt
@@ -29,7 +29,7 @@ import org.junit.runner.RunWith
 import org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers
 import org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc
+import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput
 import org.slf4j.LoggerFactory
@@ -50,9 +50,9 @@ import kotlin.test.BeforeTest
     ]
 )
 @TestPropertySource(locations = ["classpath:application-test.properties"])
-class BlueprintProcessingGRPCHandlerTest {
+class BluePrintProcessingGRPCHandlerTest {
 
-    private val log = LoggerFactory.getLogger(BlueprintProcessingGRPCHandlerTest::class.java)
+    private val log = LoggerFactory.getLogger(BluePrintProcessingGRPCHandlerTest::class.java)
 
     @MockBean
     lateinit var meterRegistry: MeterRegistry
@@ -61,7 +61,7 @@ class BlueprintProcessingGRPCHandlerTest {
     val grpcServerRule = GrpcServerRule().directExecutor()
 
     @Autowired
-    lateinit var bluePrintProcessingGRPCHandler: BlueprintProcessingGRPCHandler
+    lateinit var bluePrintProcessingGRPCHandler: BluePrintProcessingGRPCHandler
 
     lateinit var requestObs: StreamObserver<ExecutionServiceInput>
 
@@ -69,7 +69,7 @@ class BlueprintProcessingGRPCHandlerTest {
     fun init() {
         grpcServerRule.serviceRegistry.addService(bluePrintProcessingGRPCHandler)
 
-        val blockingStub = BlueprintProcessingServiceGrpc.newStub(grpcServerRule.channel)
+        val blockingStub = BluePrintProcessingServiceGrpc.newStub(grpcServerRule.channel)
 
         requestObs = blockingStub.process(object : StreamObserver<ExecutionServiceOutput> {
             override fun onNext(executionServiceOuput: ExecutionServiceOutput) {
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingIntegrationTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingIntegrationTest.kt
index d6109727f..80e953822 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingIntegrationTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingIntegrationTest.kt
@@ -27,7 +27,7 @@ import org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers
 import org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader
 import org.onap.ccsdk.cds.controllerblueprints.core.logger
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
-import org.onap.ccsdk.cds.controllerblueprints.processing.api.BlueprintProcessingServiceGrpc
+import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput
 import org.springframework.test.context.ContextConfiguration
@@ -35,9 +35,9 @@ import org.springframework.test.context.ContextConfiguration
 @ContextConfiguration(
     classes = [SelfServiceApiTestConfiguration::class, ErrorCatalogTestConfiguration::class]
 )
-class BlueprintProcessingIntegrationTest {
+class BluePrintProcessingIntegrationTest {
 
-    private val log = logger(BlueprintProcessingIntegrationTest::class)
+    private val log = logger(BluePrintProcessingIntegrationTest::class)
 
     /** This is Integration test sample, Do not enable this test case in server build, this is for local desktop testing*/
     // @Test
@@ -52,7 +52,7 @@ class BlueprintProcessingIntegrationTest {
             val basicAuthGrpcClientService = TokenAuthGrpcClientService(tokenAuthGrpcClientProperties)
             val channel = basicAuthGrpcClientService.channel()
 
-            val stub = BlueprintProcessingServiceGrpc.newStub(channel)
+            val stub = BluePrintProcessingServiceGrpc.newStub(channel)
             repeat(1) {
                 val requestObs = stub.process(object : StreamObserver<ExecutionServiceOutput> {
                     override fun onNext(executionServiceOuput: ExecutionServiceOutput) {
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingKafkaConsumerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumerTest.kt
index 56cc691a4..9143d7358 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingKafkaConsumerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BluePrintProcessingKafkaConsumerTest.kt
@@ -24,10 +24,10 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.junit.runner.RunWith
-import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintPropertiesService
-import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintPropertyConfiguration
-import org.onap.ccsdk.cds.blueprintsprocessor.message.BlueprintMessageLibConfiguration
-import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BlueprintMessageLibPropertyService
+import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertiesService
+import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertyConfiguration
+import org.onap.ccsdk.cds.blueprintsprocessor.message.BluePrintMessageLibConfiguration
+import org.onap.ccsdk.cds.blueprintsprocessor.message.service.BluePrintMessageLibPropertyService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.ContextConfiguration
@@ -39,18 +39,18 @@ import kotlin.test.assertNotNull
 @RunWith(SpringRunner::class)
 @ContextConfiguration(
     classes = [
-        BlueprintMessageLibConfiguration::class, SelfServiceApiTestConfiguration::class,
-        BlueprintPropertyConfiguration::class, BlueprintPropertiesService::class, ErrorCatalogTestConfiguration::class
+        BluePrintMessageLibConfiguration::class, SelfServiceApiTestConfiguration::class,
+        BluePrintPropertyConfiguration::class, BluePrintPropertiesService::class, ErrorCatalogTestConfiguration::class
     ]
 )
 @TestPropertySource(locations = ["classpath:application-test.properties"])
-class BlueprintProcessingKafkaConsumerTest {
+class BluePrintProcessingKafkaConsumerTest {
 
     @MockBean
     lateinit var meterRegistry: MeterRegistry
 
     @Autowired
-    lateinit var bluePrintMessageLibPropertyService: BlueprintMessageLibPropertyService
+    lateinit var bluePrintMessageLibPropertyService: BluePrintMessageLibPropertyService
 
     @Test
     fun testExecutionInputMessageConsumer() {
@@ -64,7 +64,7 @@ class BlueprintProcessingKafkaConsumerTest {
 
             coEvery { executionServiceHandle.doProcess(any()) } returns mockk()
 
-            val bluePrintProcessingKafkaConsumer = BlueprintProcessingKafkaConsumer(
+            val bluePrintProcessingKafkaConsumer = BluePrintProcessingKafkaConsumer(
                 bluePrintMessageLibPropertyService,
                 executionServiceHandle,
                 meterRegistry
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceControllerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceControllerTest.kt
index f18471127..d7d7aaa2a 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceControllerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceControllerTest.kt
@@ -21,11 +21,11 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintCoreConfiguration
+import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintCoreConfiguration
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
 import org.onap.ccsdk.cds.controllerblueprints.core.compress
 import org.onap.ccsdk.cds.controllerblueprints.core.deleteDir
-import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintCatalogService
+import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintCatalogService
 import org.onap.ccsdk.cds.controllerblueprints.core.normalizedFile
 import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils
 import org.springframework.beans.factory.annotation.Autowired
@@ -45,8 +45,8 @@ import kotlin.test.assertTrue
 @WebFluxTest
 @ContextConfiguration(
     classes = [
-        ExecutionServiceHandler::class, BlueprintCoreConfiguration::class,
-        BlueprintCatalogService::class, SelfServiceApiTestConfiguration::class,
+        ExecutionServiceHandler::class, BluePrintCoreConfiguration::class,
+        BluePrintCatalogService::class, SelfServiceApiTestConfiguration::class,
         ErrorCatalogTestConfiguration::class, SimpleMeterRegistry::class
     ]
 )
@@ -54,7 +54,7 @@ import kotlin.test.assertTrue
 class ExecutionServiceControllerTest {
 
     @Autowired
-    lateinit var blueprintsProcessorCatalogService: BlueprintCatalogService
+    lateinit var blueprintsProcessorCatalogService: BluePrintCatalogService
 
     @Autowired
     lateinit var webTestClient: WebTestClient
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt
index 526491eb5..0a89c5782 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/ExecutionServiceHandlerTest.kt
@@ -32,7 +32,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInpu
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceOutput
 import org.onap.ccsdk.cds.blueprintsprocessor.services.execution.AbstractServiceFunction
 import org.onap.ccsdk.cds.controllerblueprints.core.jsonAsJsonType
-import org.onap.ccsdk.cds.controllerblueprints.core.service.BlueprintDependencyService
+import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintDependencyService
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.ApplicationContext
@@ -62,7 +62,7 @@ class ExecutionServiceHandlerTest {
 
     @Before
     fun init() {
-        BlueprintDependencyService.inject(applicationContext)
+        BluePrintDependencyService.inject(applicationContext)
     }
 
     @Test
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/TestDatabaseConfiguration.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/TestDatabaseConfiguration.kt
index 4401fde78..bca05f68b 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/TestDatabaseConfiguration.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/TestDatabaseConfiguration.kt
@@ -16,7 +16,7 @@
 
 package org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api
 
-import org.onap.ccsdk.cds.blueprintsprocessor.db.BlueprintDBLibConfiguration
+import org.onap.ccsdk.cds.blueprintsprocessor.db.BluePrintDBLibConfiguration
 import org.onap.ccsdk.cds.blueprintsprocessor.db.PrimaryDataSourceProperties
 import org.onap.ccsdk.cds.blueprintsprocessor.db.primary.PrimaryDatabaseConfiguration
 import org.springframework.context.annotation.Bean
@@ -29,7 +29,7 @@ import org.springframework.transaction.PlatformTransactionManager
 import javax.sql.DataSource
 
 @Configuration
-@Import(BlueprintDBLibConfiguration::class)
+@Import(BluePrintDBLibConfiguration::class)
 @EnableJpaRepositories(
     basePackages = [
         "org.onap.ccsdk.cds.blueprintsprocessor.db.primary",
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BlueprintProcessingUtilsTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BlueprintProcessingUtilsTest.kt
index 10db349e6..375faa152 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BlueprintProcessingUtilsTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/utils/BlueprintProcessingUtilsTest.kt
@@ -24,7 +24,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ActionIdentifiers
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceOutput
 import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.Status
-import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants
+import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants
 import org.springframework.http.HttpStatus
 import org.springframework.test.context.junit4.SpringRunner
 
@@ -57,9 +57,9 @@ class BlueprintProcessingUtilsTest {
         }
 
         val expectedTags = mutableListOf(
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_NAME, executionServiceInput.actionIdentifiers.blueprintName),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_VERSION, executionServiceInput.actionIdentifiers.blueprintVersion),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_ACTION, executionServiceInput.actionIdentifiers.actionName)
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_NAME, executionServiceInput.actionIdentifiers.blueprintName),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_VERSION, executionServiceInput.actionIdentifiers.blueprintVersion),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_ACTION, executionServiceInput.actionIdentifiers.actionName)
         )
 
         val metricTag = cbaMetricTags(executionServiceInput)
@@ -82,11 +82,11 @@ class BlueprintProcessingUtilsTest {
         }
 
         val expectedTags = mutableListOf(
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_NAME, executionServiceOutput.actionIdentifiers.blueprintName),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_VERSION, executionServiceOutput.actionIdentifiers.blueprintVersion),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_ACTION, executionServiceOutput.actionIdentifiers.actionName),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_STATUS, executionServiceOutput.status.code.toString()),
-            Tag.of(BlueprintConstants.METRIC_TAG_BP_OUTCOME, executionServiceOutput.status.message)
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_NAME, executionServiceOutput.actionIdentifiers.blueprintName),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_VERSION, executionServiceOutput.actionIdentifiers.blueprintVersion),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_ACTION, executionServiceOutput.actionIdentifiers.actionName),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_STATUS, executionServiceOutput.status.code.toString()),
+            Tag.of(BluePrintConstants.METRIC_TAG_BP_OUTCOME, executionServiceOutput.status.message)
         )
 
         val metricTag = cbaMetricTags(executionServiceOutput)
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/validation/BlueprintRuntimeValidatorServiceTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/validation/BluePrintRuntimeValidatorServiceTest.kt
index c6b90e5b7..84d057f55 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/validation/BlueprintRuntimeValidatorServiceTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/validation/BluePrintRuntimeValidatorServiceTest.kt
@@ -20,7 +20,7 @@ import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.mock.MockResourceSource
-import org.onap.ccsdk.cds.controllerblueprints.validation.BlueprintValidationConfiguration
+import org.onap.ccsdk.cds.controllerblueprints.validation.BluePrintValidationConfiguration
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.junit4.SpringRunner
@@ -29,14 +29,14 @@ import kotlin.test.assertNotNull
 @RunWith(SpringRunner::class)
 @ContextConfiguration(
     classes = [
-        BlueprintRuntimeValidatorService::class,
-        BlueprintValidationConfiguration::class, MockResourceSource::class
+        BluePrintRuntimeValidatorService::class,
+        BluePrintValidationConfiguration::class, MockResourceSource::class
     ]
 )
-class BlueprintRuntimeValidatorServiceTest {
+class BluePrintRuntimeValidatorServiceTest {
 
     @Autowired
-    lateinit var bluePrintRuntimeValidatorService: BlueprintRuntimeValidatorService
+    lateinit var bluePrintRuntimeValidatorService: BluePrintRuntimeValidatorService
 
     @Test
     fun testBlueprintRuntimeValidation() {
@@ -45,7 +45,7 @@ class BlueprintRuntimeValidatorServiceTest {
                 "./../../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration"
             assertNotNull(bluePrintRuntimeValidatorService, " failed to initilize bluePrintRuntimeValidatorService")
 
-            bluePrintRuntimeValidatorService.validateBlueprints(blueprintBasePath)
+            bluePrintRuntimeValidatorService.validateBluePrints(blueprintBasePath)
         }
     }
 }