From 855956ec3b3a01215b9c996f5a9a9e4132811083 Mon Sep 17 00:00:00 2001
From: "Aliaksandr Ramanovich (EPAM)" <aliaksandr_ramanovich1@epam.com>
Date: Thu, 12 Jan 2023 10:25:17 +0000
Subject: [PATCH] GONRG-5894- gc rename

---
 .fossa.yml                                    |  56 +++++++++---------
 .gitlab-ci.yml                                |   6 +-
 NOTICE                                        |  12 ++--
 README.md                                     |   6 +-
 devops/{gcp => gc}/deploy/Chart.yaml          |   4 +-
 devops/{gcp => gc}/deploy/README.md           |   4 +-
 .../deploy/templates/bootstrap-configmap.yaml |   0
 .../templates/bootstrap-deployment.yaml       |   0
 .../deploy/templates/configmap.yaml           |   0
 .../deploy/templates/deployment.yaml          |   0
 .../deploy/templates/service-account.yaml     |   0
 .../{gcp => gc}/deploy/templates/service.yaml |   0
 .../deploy/templates/virtual-service.yaml     |   0
 devops/{gcp => gc}/deploy/values.yaml         |   0
 .../{gcp => gc}/pipeline/override-stages.yml  |  20 +++----
 pom.xml                                       |   2 +-
 .../{storage-gcp => storage-gc}/README.md     |   6 +-
 .../bootstrap/Dockerfile                      |   2 +-
 .../bootstrap/Python-README.md                |   0
 .../bootstrap/README.md                       |   0
 .../bootstrap/__init__.py                     |   0
 .../bootstrap/bootstrap_data.py               |   0
 .../bootstrap/bootstrap_storage.sh            |   4 +-
 .../bootstrap/config_manager.py               |   0
 .../bootstrap/delete_records.py               |   0
 .../bootstrap/download-data.sh                |   0
 .../bootstrap/prepare_records.py              |   0
 .../bootstrap/requirements.txt                |   0
 .../bootstrap/storage_client.py               |   0
 .../bootstrap/utils.py                        |   0
 .../bootstrap/validate-env.sh                 |   0
 .../cloudbuild/.gitkeep                       |   0
 .../cloudbuild/Dockerfile.cloudbuild          |   0
 .../cloudbuild/cloudbuild.yaml                |  29 +++++----
 .../docs/anthos/README.md                     |  18 +++---
 .../docs/anthos/pics/client.png               | Bin
 .../docs/anthos/pics/rabbit.PNG               | Bin
 .../docs/anthos/pics/sa.png                   | Bin
 .../docs/gcp => storage-gc/docs/gc}/README.md |  34 ++++++-----
 .../docs/gc}/pics/namespace.PNG               | Bin
 .../maven/settings.xml                        |   0
 provider/{storage-gcp => storage-gc}/pom.xml  |   2 +-
 .../scripts/deploy.sh                         |   0
 .../src/main/appengine/app.yaml               |   0
 .../provider/gcp/StorageApplicationGCP.java   |   0
 .../MessagingConfigurationProperties.java     |   0
 .../MessagingCustomContextConfiguration.java  |   0
 .../ThreadBeanFactoryPostProcessor.java       |   0
 .../LegalComplianceChangeServiceGcpImpl.java  |   0
 .../jobs/LegalTagChangedProcessing.java       |   0
 .../messaging/jobs/OqmSubscriberManager.java  |   0
 .../scope/override/ThreadDpsHeaders.java      |   0
 .../scope/override/ThreadJaxRsDpsLog.java     |   0
 .../ThreadLegalTagConsistencyValidator.java   |   0
 .../override/ThreadStorageAuditLogger.java    |   0
 .../override/ThreadTenantInfoFactory.java     |   0
 .../gcp/messaging/thread/ThreadScope.java     |   0
 .../thread/ThreadScopeAttributes.java         |   0
 .../thread/ThreadScopeContextHolder.java      |   0
 .../provider/gcp/web/cache/CacheConfig.java   |   0
 .../web/cache/LegalTagMultiTenantCache.java   |   0
 .../gcp/web/config/GcpAppServiceConfig.java   |   0
 .../WebAppMainContextConfiguration.java       |   0
 .../web/mappers/osm/OsmTypeMapperImpl.java    |   0
 .../web/middleware/GcpExceptionMapper.java    |   0
 .../provider/gcp/web/pubsub/OqmPubSub.java    |   0
 .../gcp/web/repository/ObmStorage.java        |   0
 .../web/repository/OsmQueryRepository.java    |   0
 .../OsmRecordsMetadataRepository.java         |   0
 .../web/repository/OsmSchemaRepository.java   |   0
 .../web/security/GSuiteSecurityConfig.java    |   0
 .../gcp/web/service/BatchServiceGcpImpl.java  |   0
 .../web/util/ServiceAccountJwtClientImpl.java |   0
 .../resources/application-anthos.properties   |   0
 .../main/resources/application-gcp.properties |   0
 .../resources/application-local.properties    |   0
 .../src/main/resources/application.properties |   0
 .../src/main/resources/banner.txt             |   0
 .../src/main/resources/logback.xml            |   0
 ...hreadingLegalTagChangedProcessingTest.java |   0
 .../messaging/jobs/config/PullConfigStub.java |   0
 .../messaging/jobs/stub/OqmPubSubStub.java    |   0
 .../middleware/GcpExceptionMapperTest.java    |   0
 testing/pom.xml                               |   2 +-
 .../pom.xml                                   |   2 +-
 .../PubsubEndpoint/TestPubsubEndpoint.java    |   0
 ...estPopulateLegalInfoFromParentRecords.java |   0
 .../osdu/storage/misc/TestStorageCors.java    |   0
 .../osdu/storage/misc/TestStress.java         |   0
 .../query/TestGetQueryInfoIntegration.java    |   0
 .../query/TestGetQueryKindsIntegration.java   |   0
 .../query/TestGetQueryRecordsIntegration.java |   0
 .../TestPostFetchRecordsIntegration.java      |   0
 .../TestPostQueryRecordsIntegration.java      |   0
 .../query/TestStorageQuerySuccessful.java     |   0
 ...stDeleteRecordLogicallyAndItsVersions.java |   0
 .../records/TestGetRecordsIntegration.java    |   0
 .../records/TestIngestRecordNotFound.java     |   0
 .../records/TestLogicalRecordDelete.java      |   0
 .../records/TestPurgeRecordsIntegration.java  |   0
 .../TestRecordAccessAuthorization.java        |   0
 .../records/TestRecordWithNullField.java      |   0
 .../records/TestRecordsApiAcceptance.java     |   0
 .../records/TestUpdateRecordsMetadata.java    |   0
 .../schema/TestCreateSchemaIntegration.java   |   0
 .../schema/TestStorageSchemaNegative.java     |   0
 .../osdu/storage/util/GCPTestUtils.java       |   0
 .../storage/util/GoogleServiceAccount.java    |   0
 .../src/test/resources/logback-test.xml       |   0
 .../src/test/resources/test.properties        |   0
 110 files changed, 108 insertions(+), 101 deletions(-)
 rename devops/{gcp => gc}/deploy/Chart.yaml (96%)
 rename devops/{gcp => gc}/deploy/README.md (98%)
 rename devops/{gcp => gc}/deploy/templates/bootstrap-configmap.yaml (100%)
 rename devops/{gcp => gc}/deploy/templates/bootstrap-deployment.yaml (100%)
 rename devops/{gcp => gc}/deploy/templates/configmap.yaml (100%)
 rename devops/{gcp => gc}/deploy/templates/deployment.yaml (100%)
 rename devops/{gcp => gc}/deploy/templates/service-account.yaml (100%)
 rename devops/{gcp => gc}/deploy/templates/service.yaml (100%)
 rename devops/{gcp => gc}/deploy/templates/virtual-service.yaml (100%)
 rename devops/{gcp => gc}/deploy/values.yaml (100%)
 rename devops/{gcp => gc}/pipeline/override-stages.yml (73%)
 rename provider/{storage-gcp => storage-gc}/README.md (97%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/Dockerfile (91%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/Python-README.md (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/README.md (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/__init__.py (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/bootstrap_data.py (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/bootstrap_storage.sh (91%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/config_manager.py (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/delete_records.py (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/download-data.sh (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/prepare_records.py (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/requirements.txt (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/storage_client.py (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/utils.py (100%)
 rename provider/{storage-gcp => storage-gc}/bootstrap/validate-env.sh (100%)
 rename provider/{storage-gcp => storage-gc}/cloudbuild/.gitkeep (100%)
 rename provider/{storage-gcp => storage-gc}/cloudbuild/Dockerfile.cloudbuild (100%)
 rename provider/{storage-gcp => storage-gc}/cloudbuild/cloudbuild.yaml (51%)
 rename provider/{storage-gcp => storage-gc}/docs/anthos/README.md (97%)
 rename provider/{storage-gcp => storage-gc}/docs/anthos/pics/client.png (100%)
 rename provider/{storage-gcp => storage-gc}/docs/anthos/pics/rabbit.PNG (100%)
 rename provider/{storage-gcp => storage-gc}/docs/anthos/pics/sa.png (100%)
 rename provider/{storage-gcp/docs/gcp => storage-gc/docs/gc}/README.md (87%)
 rename provider/{storage-gcp/docs/gcp => storage-gc/docs/gc}/pics/namespace.PNG (100%)
 rename provider/{storage-gcp => storage-gc}/maven/settings.xml (100%)
 rename provider/{storage-gcp => storage-gc}/pom.xml (99%)
 rename provider/{storage-gcp => storage-gc}/scripts/deploy.sh (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/appengine/app.yaml (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/StorageApplicationGCP.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingConfigurationProperties.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingCustomContextConfiguration.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/ThreadBeanFactoryPostProcessor.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalComplianceChangeServiceGcpImpl.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalTagChangedProcessing.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/OqmSubscriberManager.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadDpsHeaders.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadJaxRsDpsLog.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadLegalTagConsistencyValidator.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadStorageAuditLogger.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadTenantInfoFactory.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScope.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeAttributes.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeContextHolder.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/CacheConfig.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/LegalTagMultiTenantCache.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/GcpAppServiceConfig.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/WebAppMainContextConfiguration.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/mappers/osm/OsmTypeMapperImpl.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapper.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/pubsub/OqmPubSub.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/ObmStorage.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmQueryRepository.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmRecordsMetadataRepository.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmSchemaRepository.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/service/BatchServiceGcpImpl.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/util/ServiceAccountJwtClientImpl.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/resources/application-anthos.properties (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/resources/application-gcp.properties (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/resources/application-local.properties (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/resources/application.properties (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/resources/banner.txt (100%)
 rename provider/{storage-gcp => storage-gc}/src/main/resources/logback.xml (100%)
 rename provider/{storage-gcp => storage-gc}/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/MultiThreadingLegalTagChangedProcessingTest.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/config/PullConfigStub.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/stub/OqmPubSubStub.java (100%)
 rename provider/{storage-gcp => storage-gc}/src/test/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapperTest.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/pom.xml (99%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/util/GCPTestUtils.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/java/org/opengroup/osdu/storage/util/GoogleServiceAccount.java (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/resources/logback-test.xml (100%)
 rename testing/{storage-test-gcp => storage-test-gc}/src/test/resources/test.properties (100%)

diff --git a/.fossa.yml b/.fossa.yml
index ecb50c96a..6d7b669a2 100644
--- a/.fossa.yml
+++ b/.fossa.yml
@@ -8,31 +8,31 @@ cli:
   project: Storage
 analyze:
   modules:
-  - name: os-storage
-    type: mvn
-    target: pom.xml
-    path: .
-  - name: storage-core
-    type: mvn
-    target: storage-core/pom.xml
-    path: .
-  - name: storage-gcp
-    type: mvn
-    target: provider/storage-gcp/pom.xml
-    path: .
-  - name: storage-byoc
-    type: mvn
-    target: provider/storage-byoc/pom.xml
-    path: .
-  - name: storage-azure
-    type: mvn
-    target: provider/storage-azure/pom.xml
-    path: .
-  - name: storage-aws
-    type: mvn
-    target: provider/storage-aws/pom.xml
-    path: .
-  - name: storage-ibm
-    type: mvn
-    target: provider/storage-ibm/pom.xml
-    path: .
+    - name: os-storage
+      type: mvn
+      target: pom.xml
+      path: .
+    - name: storage-core
+      type: mvn
+      target: storage-core/pom.xml
+      path: .
+    - name: storage-gc
+      type: mvn
+      target: provider/storage-gc/pom.xml
+      path: .
+    - name: storage-byoc
+      type: mvn
+      target: provider/storage-byoc/pom.xml
+      path: .
+    - name: storage-azure
+      type: mvn
+      target: provider/storage-azure/pom.xml
+      path: .
+    - name: storage-aws
+      type: mvn
+      target: provider/storage-aws/pom.xml
+      path: .
+    - name: storage-ibm
+      type: mvn
+      target: provider/storage-ibm/pom.xml
+      path: .
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e39b753e2..5205ebcca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,6 @@ variables:
   IBM_HELM_CONFIG_PATH: devops/ibm/ibm-storage-config
   IBM_HELM_DEPLOY_PATH: devops/ibm/ibm-storage-deploy
 
-
 include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "standard-setup.yml"
@@ -55,7 +54,7 @@ include:
     file: "cloud-providers/ibm.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
-    file: "cloud-providers/osdu-gcp-global.yml"
+    file: "cloud-providers/gc-global.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "publishing/pages.yml"
@@ -72,8 +71,7 @@ include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/ibm.yml"
 
-
-  - local: "devops/gcp/pipeline/override-stages.yml"
+  - local: "devops/gc/pipeline/override-stages.yml"
 
 # disable the eslint scanner
 # I think this is being generated from the presence of an HTML file, but there
diff --git a/NOTICE b/NOTICE
index 38c4e87f7..fa98e0e8a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -613,7 +613,7 @@ The following software have components provided under the terms of this license:
 - Hamcrest (from http://hamcrest.org/JavaHamcrest/)
 - Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
 - Jackson module: Afterburner (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-modules-base)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
 - Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -686,7 +686,7 @@ The following software have components provided under the terms of this license:
 
 - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
 - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
 - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
 - JavaBeans Activation Framework (from https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
 - OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator)
@@ -733,7 +733,7 @@ The following software have components provided under the terms of this license:
 - JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta Bean Validation API (from https://beanvalidation.org)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
@@ -759,7 +759,7 @@ The following software have components provided under the terms of this license:
 - JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta Bean Validation API (from https://beanvalidation.org)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
@@ -782,7 +782,7 @@ GPL-2.0-with-classpath-exception
 The following software have components provided under the terms of this license:
 
 - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta Bean Validation API (from https://beanvalidation.org)
 - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
@@ -999,4 +999,4 @@ unknown
 The following software have components provided under the terms of this license:
 
 - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
-- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
+- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
diff --git a/README.md b/README.md
index 284f200b5..b6c2f0a0d 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ deploy resources to the AWS console, see the deployment section below.
     java -jar storage-service-byoc\target\storage-byoc-0.0.1-SNAPSHOT-spring-boot.jar
     
     # Running Google Cloud:
-    java -jar  -Dspring.profiles.active=local storage-service-gcp\target\storage-gcp-0.0.1-SNAPSHOT-spring-boot.jar
+    java -jar  -Dspring.profiles.active=local storage-service-gc\target\storage-gc-0.0.1-SNAPSHOT-spring-boot.jar
     
     # Running Azure:
     java -jar storage-service-azure\target\storage-azure-0.0.1-SNAPSHOT-spring-boot.jar
@@ -133,7 +133,7 @@ Instructions for running the Azure integration tests can be found [here](./provi
 
 ### Google Cloud
 
-Instructions for running the Google Cloud integration tests can be found [here](./provider/storage-gcp/README.md).
+Instructions for running the Google Cloud integration tests can be found [here](./provider/storage-gc/README.md).
 
 ### AWS
 
@@ -152,4 +152,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/devops/gcp/deploy/Chart.yaml b/devops/gc/deploy/Chart.yaml
similarity index 96%
rename from devops/gcp/deploy/Chart.yaml
rename to devops/gc/deploy/Chart.yaml
index a440c62a6..5e5e0e1f2 100644
--- a/devops/gcp/deploy/Chart.yaml
+++ b/devops/gc/deploy/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: gcp-storage-deploy
+name: gc-storage-deploy
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "1.19.0"
diff --git a/devops/gcp/deploy/README.md b/devops/gc/deploy/README.md
similarity index 98%
rename from devops/gcp/deploy/README.md
rename to devops/gc/deploy/README.md
index 6c3ce83f4..f2b91eacb 100644
--- a/devops/gcp/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -79,7 +79,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
 Run this command from within this directory:
 
 ```console
-helm install gcp-storage-deploy .
+helm install gc-storage-deploy .
 ```
 
 ## Uninstall the Helm chart
@@ -87,7 +87,7 @@ helm install gcp-storage-deploy .
 To uninstall the helm deployment:
 
 ```console
-helm uninstall gcp-storage-deploy
+helm uninstall gc-storage-deploy
 ```
 
 > Do not forget to delete all k8s secrets and PVCs accociated with the Service.
diff --git a/devops/gcp/deploy/templates/bootstrap-configmap.yaml b/devops/gc/deploy/templates/bootstrap-configmap.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/bootstrap-configmap.yaml
rename to devops/gc/deploy/templates/bootstrap-configmap.yaml
diff --git a/devops/gcp/deploy/templates/bootstrap-deployment.yaml b/devops/gc/deploy/templates/bootstrap-deployment.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/bootstrap-deployment.yaml
rename to devops/gc/deploy/templates/bootstrap-deployment.yaml
diff --git a/devops/gcp/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/configmap.yaml
rename to devops/gc/deploy/templates/configmap.yaml
diff --git a/devops/gcp/deploy/templates/deployment.yaml b/devops/gc/deploy/templates/deployment.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/deployment.yaml
rename to devops/gc/deploy/templates/deployment.yaml
diff --git a/devops/gcp/deploy/templates/service-account.yaml b/devops/gc/deploy/templates/service-account.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/service-account.yaml
rename to devops/gc/deploy/templates/service-account.yaml
diff --git a/devops/gcp/deploy/templates/service.yaml b/devops/gc/deploy/templates/service.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/service.yaml
rename to devops/gc/deploy/templates/service.yaml
diff --git a/devops/gcp/deploy/templates/virtual-service.yaml b/devops/gc/deploy/templates/virtual-service.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/virtual-service.yaml
rename to devops/gc/deploy/templates/virtual-service.yaml
diff --git a/devops/gcp/deploy/values.yaml b/devops/gc/deploy/values.yaml
similarity index 100%
rename from devops/gcp/deploy/values.yaml
rename to devops/gc/deploy/values.yaml
diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
similarity index 73%
rename from devops/gcp/pipeline/override-stages.yml
rename to devops/gc/pipeline/override-stages.yml
index b50520a82..2f9fabb75 100644
--- a/devops/gcp/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -1,9 +1,9 @@
 variables:
-  OSDU_GCP_SERVICE: storage
-  OSDU_GCP_VENDOR: gcp
-  NO_DATA_ACCESS_TESTER: $OSDU_GCP_NO_DATA_ACCESS_TESTER
+  GC_SERVICE: storage
+  GC_VENDOR: gc
+  NO_DATA_ACCESS_TESTER: $GC_NO_DATA_ACCESS_TESTER
   # FIXME remove when all services are migrated to a single helm
-  OSDU_GCP_ENABLE_HELM_CONFIG: "false"
+  GC_ENABLE_HELM_CONFIG: "false"
 
 .define_DATA_BRANCH:
   script:
@@ -19,22 +19,22 @@ variables:
         REF_DATA_BRANCH="master";
       fi;
 
-osdu-gcp-anthos-test:
+gc-anthos-test:
   variables:
-    OSDU_GCP_VENDOR: anthos
+    GC_VENDOR: anthos
     TEST_NO_ACCESS_OPENID_PROVIDER_CLIENT_ID: storage-no-access-tester
     TEST_NO_ACCESS_OPENID_PROVIDER_CLIENT_SECRET: $OSDU_ANTHOS_STORAGE_NO_ACCESS_CLIENT_SECRET
 
-osdu-gcp-containerize-bootstrap-gitlab:
+gc-containerize-bootstrap-gitlab:
   variables:
-    OSDU_GCP_ENABLE_BOOTSTRAP: "true"
+    GC_ENABLE_BOOTSTRAP: "true"
     BUILD_ARGS: "--build-arg DATA_BRANCH=$REF_DATA_BRANCH"
   before_script:
     - !reference [.define_DATA_BRANCH, script]
 
-osdu-gcp-containerize-bootstrap-gcr:
+gc-containerize-bootstrap-gcr:
   variables:
-    OSDU_GCP_ENABLE_BOOTSTRAP: "true"
+    GC_ENABLE_BOOTSTRAP: "true"
     BUILD_ARGS: "--build-arg DATA_BRANCH=$REF_DATA_BRANCH"
   before_script:
     - !reference [.define_DATA_BRANCH, script]
diff --git a/pom.xml b/pom.xml
index 6042fd4c4..10747f664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
 
   <modules>
 		<module>storage-core</module>
-		<module>provider/storage-gcp</module>
+		<module>provider/storage-gc</module>
 		<module>provider/storage-byoc</module>
 		<module>provider/storage-azure</module>
 		<module>provider/storage-aws</module>
diff --git a/provider/storage-gcp/README.md b/provider/storage-gc/README.md
similarity index 97%
rename from provider/storage-gcp/README.md
rename to provider/storage-gc/README.md
index f49580f48..9ad43bc8b 100644
--- a/provider/storage-gcp/README.md
+++ b/provider/storage-gc/README.md
@@ -51,7 +51,7 @@ In the current version, the mappers are equipped with several drivers to the sto
 ### Anthos Service Configuration:
 [Anthos service configuration ](docs/anthos/README.md)
 ### Google Cloud Service Configuration:
-[Google Cloud service configuration ](docs/gcp/README.md)
+[Google Cloud service configuration ](docs/gc/README.md)
 
 ## Run service
 
@@ -130,7 +130,7 @@ After configuring your environment as specified above, you can follow these step
 These steps should be invoked from the *repository root.*
 
 ```bash
-cd provider/storage-gcp/ && mvn spring-boot:run
+cd provider/storage-gc/ && mvn spring-boot:run
 ```
 
 ## Testing
@@ -142,7 +142,7 @@ This section describes how to run cloud OSDU E2E tests.
 ### Anthos test configuration:
 [Anthos service configuration ](docs/anthos/README.md)
 ### Google Cloud test configuration:
-[Google Cloud service configuration ](docs/gcp/README.md)
+[Google Cloud service configuration ](docs/gc/README.md)
 
 
 ## Deployment
diff --git a/provider/storage-gcp/bootstrap/Dockerfile b/provider/storage-gc/bootstrap/Dockerfile
similarity index 91%
rename from provider/storage-gcp/bootstrap/Dockerfile
rename to provider/storage-gc/bootstrap/Dockerfile
index 94a032e78..0bdf1f147 100644
--- a/provider/storage-gcp/bootstrap/Dockerfile
+++ b/provider/storage-gc/bootstrap/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /opt
 ENV MANIFESTS_DIR="./manifests"
 ENV DATA_BRANCH=${DATA_BRANCH}
 
-COPY ./provider/storage-gcp/bootstrap ./
+COPY ./provider/storage-gc/bootstrap ./
 
 RUN apt-get update \
     && apt-get install zip jq -y \ 
diff --git a/provider/storage-gcp/bootstrap/Python-README.md b/provider/storage-gc/bootstrap/Python-README.md
similarity index 100%
rename from provider/storage-gcp/bootstrap/Python-README.md
rename to provider/storage-gc/bootstrap/Python-README.md
diff --git a/provider/storage-gcp/bootstrap/README.md b/provider/storage-gc/bootstrap/README.md
similarity index 100%
rename from provider/storage-gcp/bootstrap/README.md
rename to provider/storage-gc/bootstrap/README.md
diff --git a/provider/storage-gcp/bootstrap/__init__.py b/provider/storage-gc/bootstrap/__init__.py
similarity index 100%
rename from provider/storage-gcp/bootstrap/__init__.py
rename to provider/storage-gc/bootstrap/__init__.py
diff --git a/provider/storage-gcp/bootstrap/bootstrap_data.py b/provider/storage-gc/bootstrap/bootstrap_data.py
similarity index 100%
rename from provider/storage-gcp/bootstrap/bootstrap_data.py
rename to provider/storage-gc/bootstrap/bootstrap_data.py
diff --git a/provider/storage-gcp/bootstrap/bootstrap_storage.sh b/provider/storage-gc/bootstrap/bootstrap_storage.sh
similarity index 91%
rename from provider/storage-gcp/bootstrap/bootstrap_storage.sh
rename to provider/storage-gc/bootstrap/bootstrap_storage.sh
index ddc088fb4..c993d0fe7 100644
--- a/provider/storage-gcp/bootstrap/bootstrap_storage.sh
+++ b/provider/storage-gc/bootstrap/bootstrap_storage.sh
@@ -3,7 +3,7 @@
 # Script that bootstraps storage service using Python scripts
 # It creates legal tag via request to Legal service
 # After that records are uploaded via requests to Storage service, using previously created Legal tag
-# Contains logic for both onprem and gcp version
+# Contains logic for both reference and google cloud version
 
 set -ex
 
@@ -30,7 +30,7 @@ if [ "${ONPREM_ENABLED}" == "true" ]; then
     python3 /opt/bootstrap_data.py
 
 else
-    # Check that all GCP env variables are provided
+    # Check that all Google Cloud env variables are provided
     export CLOUD_PROVIDER="gcp"
     
     python3 /opt/bootstrap_data.py
diff --git a/provider/storage-gcp/bootstrap/config_manager.py b/provider/storage-gc/bootstrap/config_manager.py
similarity index 100%
rename from provider/storage-gcp/bootstrap/config_manager.py
rename to provider/storage-gc/bootstrap/config_manager.py
diff --git a/provider/storage-gcp/bootstrap/delete_records.py b/provider/storage-gc/bootstrap/delete_records.py
similarity index 100%
rename from provider/storage-gcp/bootstrap/delete_records.py
rename to provider/storage-gc/bootstrap/delete_records.py
diff --git a/provider/storage-gcp/bootstrap/download-data.sh b/provider/storage-gc/bootstrap/download-data.sh
similarity index 100%
rename from provider/storage-gcp/bootstrap/download-data.sh
rename to provider/storage-gc/bootstrap/download-data.sh
diff --git a/provider/storage-gcp/bootstrap/prepare_records.py b/provider/storage-gc/bootstrap/prepare_records.py
similarity index 100%
rename from provider/storage-gcp/bootstrap/prepare_records.py
rename to provider/storage-gc/bootstrap/prepare_records.py
diff --git a/provider/storage-gcp/bootstrap/requirements.txt b/provider/storage-gc/bootstrap/requirements.txt
similarity index 100%
rename from provider/storage-gcp/bootstrap/requirements.txt
rename to provider/storage-gc/bootstrap/requirements.txt
diff --git a/provider/storage-gcp/bootstrap/storage_client.py b/provider/storage-gc/bootstrap/storage_client.py
similarity index 100%
rename from provider/storage-gcp/bootstrap/storage_client.py
rename to provider/storage-gc/bootstrap/storage_client.py
diff --git a/provider/storage-gcp/bootstrap/utils.py b/provider/storage-gc/bootstrap/utils.py
similarity index 100%
rename from provider/storage-gcp/bootstrap/utils.py
rename to provider/storage-gc/bootstrap/utils.py
diff --git a/provider/storage-gcp/bootstrap/validate-env.sh b/provider/storage-gc/bootstrap/validate-env.sh
similarity index 100%
rename from provider/storage-gcp/bootstrap/validate-env.sh
rename to provider/storage-gc/bootstrap/validate-env.sh
diff --git a/provider/storage-gcp/cloudbuild/.gitkeep b/provider/storage-gc/cloudbuild/.gitkeep
similarity index 100%
rename from provider/storage-gcp/cloudbuild/.gitkeep
rename to provider/storage-gc/cloudbuild/.gitkeep
diff --git a/provider/storage-gcp/cloudbuild/Dockerfile.cloudbuild b/provider/storage-gc/cloudbuild/Dockerfile.cloudbuild
similarity index 100%
rename from provider/storage-gcp/cloudbuild/Dockerfile.cloudbuild
rename to provider/storage-gc/cloudbuild/Dockerfile.cloudbuild
diff --git a/provider/storage-gcp/cloudbuild/cloudbuild.yaml b/provider/storage-gc/cloudbuild/cloudbuild.yaml
similarity index 51%
rename from provider/storage-gcp/cloudbuild/cloudbuild.yaml
rename to provider/storage-gc/cloudbuild/cloudbuild.yaml
index e4f86245e..61563cdfa 100644
--- a/provider/storage-gcp/cloudbuild/cloudbuild.yaml
+++ b/provider/storage-gc/cloudbuild/cloudbuild.yaml
@@ -1,4 +1,3 @@
-
 # Copyright 2020 Google LLC
 # Copyright 2017-2019, Schlumberger
 # Copyright 2020 EPAM
@@ -16,16 +15,22 @@
 # limitations under the License.
 
 steps:
-  - name: 'gcr.io/cloud-builders/docker'
-    args: [
-            'build',
-            '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
-            '--build-arg', 'PORT=${_PORT}',
-            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:${_SHORT_SHA}',
-            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:latest',
-            '-f', 'provider/${_GCP_SERVICE}-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
-            '.'
-    ]
+  - name: "gcr.io/cloud-builders/docker"
+    args:
+      [
+        "build",
+        "--build-arg",
+        "PROVIDER_NAME=${_PROVIDER_NAME}",
+        "--build-arg",
+        "PORT=${_PORT}",
+        "-t",
+        "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}:${_SHORT_SHA}",
+        "-t",
+        "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}:latest",
+        "-f",
+        "provider/${_GC_SERVICE}-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild",
+        ".",
+      ]
 
 images:
-  - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}'
+  - "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}"
diff --git a/provider/storage-gcp/docs/anthos/README.md b/provider/storage-gc/docs/anthos/README.md
similarity index 97%
rename from provider/storage-gcp/docs/anthos/README.md
rename to provider/storage-gc/docs/anthos/README.md
index ac422f41c..db7e80015 100644
--- a/provider/storage-gcp/docs/anthos/README.md
+++ b/provider/storage-gc/docs/anthos/README.md
@@ -55,7 +55,7 @@ Must have:
 | `POLICY_ID`                 | ex `search`                                   | policeId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no         | -                                   |
 | `PARTITION_API`             | ex `http://localhost:8081/api/partition/v1`   | Partition service endpoint                                                            | no         | -                                   |
 
-These variables define service behavior, and are used to switch between `anthos` or `gcp` environments, their overriding and usage in mixed mode was not tested.
+These variables define service behavior, and are used to switch between `Reference` or `Google Cloud` environments, their overriding and usage in mixed mode was not tested.
 Usage of spring profiles is preferred.
 
 | name                     | value                | description                                                                                                               | sensitive? | source |
@@ -131,13 +131,13 @@ For example, this is how **Datastore** OSM driver contains records for "RecordsC
 And this is how **Postgres** OSM driver does. Notice, the above hierarchy is kept, but Postgres uses alternative entities
 for it.
 
-| Datastore hierarchy level |     | Postgres alternative used  |
-|---------------------------|-----|----------------------------|
-| partition (GCP project)   | ==  | Postgres server URL        |
-| namespace                 | ==  | Schema                     |
-| kind                      | ==  | Table                      |
-| record                    | ==  | '<multiple table records>' |
-| columns                   | ==  | id, data (jsonb)           |
+| Datastore hierarchy level          |     | Postgres alternative used  |
+|------------------------------------|-----|----------------------------|
+| partition (Google Cloud project)   | ==  | Postgres server URL        |
+| namespace                          | ==  | Schema                     |
+| kind                               | ==  | Table                      |
+| record                             | ==  | '<multiple table records>' |
+| columns                            | ==  | id, data (jsonb)           |
 
 As we can see in the above table, Postgres uses different approach in storing business data in records. Not like
 Datastore, which segments data into multiple physical columns, Postgres organises them into the single JSONB "data"
@@ -435,7 +435,7 @@ You will need to have the following environment variables defined.
 | name | value | description | sensitive? | source |
 | ---  | ---   | ---         | ---        | ---    |
 | `DEPLOY_ENV` | `empty` | Required but not used, should be set up with string "empty"| no | - |
-| `DOMAIN` | ex`opendes-gcp.projects.com` | OSDU R2 to run tests under | no | - |
+| `DOMAIN` | ex`opendes-gc.projects.com` | OSDU R2 to run tests under | no | - |
 | `LEGAL_URL` | ex`http://localhsot:8080/api/legal/v1/` | Legal API endpoint | no | - |
 | `STORAGE_URL` | ex`http://localhost:8080/api/storage/v2/` | Endpoint of storage service | no | - |
 | `TENANT_NAME` | ex `opendes` | OSDU tenant used for testing | no | -- |
diff --git a/provider/storage-gcp/docs/anthos/pics/client.png b/provider/storage-gc/docs/anthos/pics/client.png
similarity index 100%
rename from provider/storage-gcp/docs/anthos/pics/client.png
rename to provider/storage-gc/docs/anthos/pics/client.png
diff --git a/provider/storage-gcp/docs/anthos/pics/rabbit.PNG b/provider/storage-gc/docs/anthos/pics/rabbit.PNG
similarity index 100%
rename from provider/storage-gcp/docs/anthos/pics/rabbit.PNG
rename to provider/storage-gc/docs/anthos/pics/rabbit.PNG
diff --git a/provider/storage-gcp/docs/anthos/pics/sa.png b/provider/storage-gc/docs/anthos/pics/sa.png
similarity index 100%
rename from provider/storage-gcp/docs/anthos/pics/sa.png
rename to provider/storage-gc/docs/anthos/pics/sa.png
diff --git a/provider/storage-gcp/docs/gcp/README.md b/provider/storage-gc/docs/gc/README.md
similarity index 87%
rename from provider/storage-gcp/docs/gcp/README.md
rename to provider/storage-gc/docs/gc/README.md
index a89ca6d10..212cd79db 100644
--- a/provider/storage-gcp/docs/gcp/README.md
+++ b/provider/storage-gc/docs/gc/README.md
@@ -1,6 +1,7 @@
 # Service Configuration for Google Cloud
 
 ## Table of Contents <a name="TOC"></a>
+
 * [Environment variables](#Environment-variables)
 * [Common properties for all environments](#Common-properties-for-all-environments)
 * [For Mappers to activate drivers](#For-Mappers-to-activate-drivers)
@@ -18,7 +19,7 @@ Must have:
 | name | value | description | sensitive? | source |
 | ---  | ---   | ---         | ---        | ---    |
 | `SPRING_PROFILES_ACTIVE` | ex `gcp` | Spring profile that activate default configuration for Google Cloud environment | false | - |
-| `STORAGE_SERVICE_ACCOUNT_EMAIL` | `workload-storage-gcp@nice-etching-277309.iam.gserviceaccount.com` |  Storage service account email, used during OQM events processing |no| - |
+| `STORAGE_SERVICE_ACCOUNT_EMAIL` | `workload-storage-gc@nice-etching-277309.iam.gserviceaccount.com` |  Storage service account email, used during OQM events processing |no| - |
 
 ### Common properties for all environments
 
@@ -28,7 +29,7 @@ Must have:
 | `SERVER_SERVLET_CONTEXPATH`      | `/api/storage/v2/`                            | Servlet context path                                                                  | no         | -                                                          |
 | `AUTHORIZE_API`                  | ex `https://entitlements.com/entitlements/v1` | Entitlements API endpoint                                                             | no         | output of infrastructure deployment                        |
 | `LEGALTAG_API`                   | ex `https://legal.com/api/legal/v1`           | Legal API endpoint                                                                    | no         | output of infrastructure deployment                        |
-| `PUBSUB_SEARCH_TOPIC`            | ex `records-changed`                          | PubSub topic name                                                                     | no         | https://console.cloud.google.com/cloudpubsub/topic         |
+| `PUBSUB_SEARCH_TOPIC`            | ex `records-changed`                          | PubSub topic name                                                                     | no         | <https://console.cloud.google.com/cloudpubsub/topic>         |
 | `REDIS_GROUP_HOST`               | ex `127.0.0.1`                                | Redis host for groups                                                                 | no         |                                                            |
 | `REDIS_GROUP_PASSWORD`           | ex `*****`                                    | Redis groups host password                                                            | yes        |                                                            |
 | `REDIS_GROUP_WITH_SSL`           | ex `true` or `false`                          | Redis groups host ssl config                                                          | no         |                                                            |
@@ -41,9 +42,9 @@ Must have:
 | `POLICY_API`                     | ex `http://localhost:8080/api/policy/v1/`     | Police service endpoint                                                               | no         | output of infrastructure deployment                        |
 | `POLICY_ID`                      | ex `storage`                                  | policeId from ex `http://localhost:8080/api/policy/v1/policies`. Look at `POLICY_API` | no         | -                                                          |
 | `PARTITION_API`                  | ex `http://localhost:8081/api/partition/v1`   | Partition service endpoint                                                            | no         | -                                                          |
-| `GOOGLE_APPLICATION_CREDENTIALS` | ex `/path/to/directory/service-key.json`      | Service account credentials, you only need this if running locally                    | yes        | https://console.cloud.google.com/iam-admin/serviceaccounts |
+| `GOOGLE_APPLICATION_CREDENTIALS` | ex `/path/to/directory/service-key.json`      | Service account credentials, you only need this if running locally                    | yes        | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
 
-These variables define service behavior, and are used to switch between `anthos` or `gcp` environments, their overriding and usage in mixed mode was not tested.
+These variables define service behavior, and are used to switch between `Reference` or `Google Cloud` environments, their overriding and usage in mixed mode was not tested.
 Usage of spring profiles is preferred.
 
 | name | value | description | sensitive? | source |
@@ -81,21 +82,20 @@ At PubSub should be created topic with name:
 
 It can be overridden by:
 
-- through the Spring Boot property `pubsub-search-topic`
-- environment variable `PUBSUB_SEARCH_TOPIC`
+* through the Spring Boot property `pubsub-search-topic`
+* environment variable `PUBSUB_SEARCH_TOPIC`
 
 <!-- Yay, no errors, warnings, or alerts! -->
 
-
 ## GCS configuration <a name="ObjectStoreConfig"></a>
+
 ### Per-tenant buckets configuration
 
 These buckets must be defined in tenants’ “data” Google Cloud projects that names are pointed in tenants’ PartitionInfo registration objects’ “projectId” property at the Partition service.
 
-
 <table>
   <tr>
-   <td>Bucket Naming template 
+   <td>Bucket Naming template
    </td>
    <td>Permissions required
    </td>
@@ -108,8 +108,8 @@ These buckets must be defined in tenants’ “data” Google Cloud projects tha
   </tr>
 </table>
 
-
 ## Google Cloud service account configuration
+
 TBD
 
 | Required roles |
@@ -122,18 +122,22 @@ You will need to have the following environment variables defined.
 
 | name | value | description | sensitive? | source |
 | ---  | ---   | ---         | ---        | ---    |
+<<<<<<< HEAD:provider/storage-gcp/docs/gcp/README.md
+=======
+| `INTEGRATION_TEST_AUDIENCE` | `*****.apps.googleusercontent.com` | client application ID | yes | <https://console.cloud.google.com/apis/credentials> |
+>>>>>>> b8f67538 (GONRG-5894- gc rename):provider/storage-gc/docs/gc/README.md
 | `DEPLOY_ENV` | `empty` | Required but not used, should be set up with string "empty"| no | - |
-| `DOMAIN` | ex`opendes-gcp.projects.com` | OSDU R2 to run tests under | no | - |
-| `INTEGRATION_TESTER` | `********` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already | yes | https://console.cloud.google.com/iam-admin/serviceaccounts |
+| `DOMAIN` | ex`opendes-gc.projects.com` | OSDU R2 to run tests under | no | - |
+| `INTEGRATION_TESTER` | `********` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
 | `LEGAL_URL` | ex`http://localhsot:8080/api/legal/v1/` | Legal API endpoint | no | - |
-| `NO_DATA_ACCESS_TESTER` | `********` | Service account base64 encoded string without data access | yes | https://console.cloud.google.com/iam-admin/serviceaccounts |
+| `NO_DATA_ACCESS_TESTER` | `********` | Service account base64 encoded string without data access | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
 | `PUBSUB_TOKEN` | `****` | ? | no | - |
 | `STORAGE_URL` | ex`http://localhost:8080/api/storage/v2/` | Endpoint of storage service | no | - |
 | `TENANT_NAME` | ex `opendes` | OSDU tenant used for testing | no | -- |
 
 **Entitlements configuration for integration accounts**
 
-| INTEGRATION_TESTER | NO_DATA_ACCESS_TESTER | 
+| INTEGRATION_TESTER | NO_DATA_ACCESS_TESTER |
 | ---  | ---   |
 | users<br/>service.entitlements.user<br/>service.storage.admin<br/>service.storage.creator<br/>service.storage.viewer<br/>service.legal.admin<br/>service.legal.editor<br/>data.test1<br/>data.integration.test | users<br/>service.entitlements.user<br/>service.storage.admin |
 
@@ -148,5 +152,5 @@ Execute following command to build code and run all the integration tests:
 
  ```bash
  # build + run Google Cloud integration tests.
- $ (cd testing/storage-test-gcp/ && mvn clean test)
+ $ (cd testing/storage-test-gc/ && mvn clean test)
  ```
diff --git a/provider/storage-gcp/docs/gcp/pics/namespace.PNG b/provider/storage-gc/docs/gc/pics/namespace.PNG
similarity index 100%
rename from provider/storage-gcp/docs/gcp/pics/namespace.PNG
rename to provider/storage-gc/docs/gc/pics/namespace.PNG
diff --git a/provider/storage-gcp/maven/settings.xml b/provider/storage-gc/maven/settings.xml
similarity index 100%
rename from provider/storage-gcp/maven/settings.xml
rename to provider/storage-gc/maven/settings.xml
diff --git a/provider/storage-gcp/pom.xml b/provider/storage-gc/pom.xml
similarity index 99%
rename from provider/storage-gcp/pom.xml
rename to provider/storage-gc/pom.xml
index af2697e43..8e6d00253 100644
--- a/provider/storage-gcp/pom.xml
+++ b/provider/storage-gc/pom.xml
@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opengroup.osdu</groupId>
-    <artifactId>storage-gcp</artifactId>
+    <artifactId>storage-gc</artifactId>
     <version>0.19.0-SNAPSHOT</version>
     <description>Google cloud related implementation staff.</description>
     <packaging>jar</packaging>
diff --git a/provider/storage-gcp/scripts/deploy.sh b/provider/storage-gc/scripts/deploy.sh
similarity index 100%
rename from provider/storage-gcp/scripts/deploy.sh
rename to provider/storage-gc/scripts/deploy.sh
diff --git a/provider/storage-gcp/src/main/appengine/app.yaml b/provider/storage-gc/src/main/appengine/app.yaml
similarity index 100%
rename from provider/storage-gcp/src/main/appengine/app.yaml
rename to provider/storage-gc/src/main/appengine/app.yaml
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/StorageApplicationGCP.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/StorageApplicationGCP.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/StorageApplicationGCP.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/StorageApplicationGCP.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingConfigurationProperties.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingConfigurationProperties.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingConfigurationProperties.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingConfigurationProperties.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingCustomContextConfiguration.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingCustomContextConfiguration.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingCustomContextConfiguration.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/MessagingCustomContextConfiguration.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/ThreadBeanFactoryPostProcessor.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/ThreadBeanFactoryPostProcessor.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/ThreadBeanFactoryPostProcessor.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/config/ThreadBeanFactoryPostProcessor.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalComplianceChangeServiceGcpImpl.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalComplianceChangeServiceGcpImpl.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalComplianceChangeServiceGcpImpl.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalComplianceChangeServiceGcpImpl.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalTagChangedProcessing.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalTagChangedProcessing.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalTagChangedProcessing.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/LegalTagChangedProcessing.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/OqmSubscriberManager.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/OqmSubscriberManager.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/OqmSubscriberManager.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/OqmSubscriberManager.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadDpsHeaders.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadDpsHeaders.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadDpsHeaders.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadDpsHeaders.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadJaxRsDpsLog.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadJaxRsDpsLog.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadJaxRsDpsLog.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadJaxRsDpsLog.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadLegalTagConsistencyValidator.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadLegalTagConsistencyValidator.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadLegalTagConsistencyValidator.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadLegalTagConsistencyValidator.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadStorageAuditLogger.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadStorageAuditLogger.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadStorageAuditLogger.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadStorageAuditLogger.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadTenantInfoFactory.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadTenantInfoFactory.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadTenantInfoFactory.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/scope/override/ThreadTenantInfoFactory.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScope.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScope.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScope.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScope.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeAttributes.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeAttributes.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeAttributes.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeAttributes.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeContextHolder.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeContextHolder.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeContextHolder.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/messaging/thread/ThreadScopeContextHolder.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/CacheConfig.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/CacheConfig.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/CacheConfig.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/CacheConfig.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/LegalTagMultiTenantCache.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/LegalTagMultiTenantCache.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/LegalTagMultiTenantCache.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/cache/LegalTagMultiTenantCache.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/GcpAppServiceConfig.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/GcpAppServiceConfig.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/GcpAppServiceConfig.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/GcpAppServiceConfig.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/WebAppMainContextConfiguration.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/WebAppMainContextConfiguration.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/WebAppMainContextConfiguration.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/config/WebAppMainContextConfiguration.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/mappers/osm/OsmTypeMapperImpl.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/mappers/osm/OsmTypeMapperImpl.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/mappers/osm/OsmTypeMapperImpl.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/mappers/osm/OsmTypeMapperImpl.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapper.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapper.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapper.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapper.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/pubsub/OqmPubSub.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/pubsub/OqmPubSub.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/pubsub/OqmPubSub.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/pubsub/OqmPubSub.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/ObmStorage.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/ObmStorage.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/ObmStorage.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/ObmStorage.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmQueryRepository.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmQueryRepository.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmQueryRepository.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmQueryRepository.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmRecordsMetadataRepository.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmRecordsMetadataRepository.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmRecordsMetadataRepository.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmRecordsMetadataRepository.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmSchemaRepository.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmSchemaRepository.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmSchemaRepository.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/repository/OsmSchemaRepository.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/service/BatchServiceGcpImpl.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/service/BatchServiceGcpImpl.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/service/BatchServiceGcpImpl.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/service/BatchServiceGcpImpl.java
diff --git a/provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/util/ServiceAccountJwtClientImpl.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/util/ServiceAccountJwtClientImpl.java
similarity index 100%
rename from provider/storage-gcp/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/util/ServiceAccountJwtClientImpl.java
rename to provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/util/ServiceAccountJwtClientImpl.java
diff --git a/provider/storage-gcp/src/main/resources/application-anthos.properties b/provider/storage-gc/src/main/resources/application-anthos.properties
similarity index 100%
rename from provider/storage-gcp/src/main/resources/application-anthos.properties
rename to provider/storage-gc/src/main/resources/application-anthos.properties
diff --git a/provider/storage-gcp/src/main/resources/application-gcp.properties b/provider/storage-gc/src/main/resources/application-gcp.properties
similarity index 100%
rename from provider/storage-gcp/src/main/resources/application-gcp.properties
rename to provider/storage-gc/src/main/resources/application-gcp.properties
diff --git a/provider/storage-gcp/src/main/resources/application-local.properties b/provider/storage-gc/src/main/resources/application-local.properties
similarity index 100%
rename from provider/storage-gcp/src/main/resources/application-local.properties
rename to provider/storage-gc/src/main/resources/application-local.properties
diff --git a/provider/storage-gcp/src/main/resources/application.properties b/provider/storage-gc/src/main/resources/application.properties
similarity index 100%
rename from provider/storage-gcp/src/main/resources/application.properties
rename to provider/storage-gc/src/main/resources/application.properties
diff --git a/provider/storage-gcp/src/main/resources/banner.txt b/provider/storage-gc/src/main/resources/banner.txt
similarity index 100%
rename from provider/storage-gcp/src/main/resources/banner.txt
rename to provider/storage-gc/src/main/resources/banner.txt
diff --git a/provider/storage-gcp/src/main/resources/logback.xml b/provider/storage-gc/src/main/resources/logback.xml
similarity index 100%
rename from provider/storage-gcp/src/main/resources/logback.xml
rename to provider/storage-gc/src/main/resources/logback.xml
diff --git a/provider/storage-gcp/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/MultiThreadingLegalTagChangedProcessingTest.java b/provider/storage-gc/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/MultiThreadingLegalTagChangedProcessingTest.java
similarity index 100%
rename from provider/storage-gcp/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/MultiThreadingLegalTagChangedProcessingTest.java
rename to provider/storage-gc/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/MultiThreadingLegalTagChangedProcessingTest.java
diff --git a/provider/storage-gcp/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/config/PullConfigStub.java b/provider/storage-gc/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/config/PullConfigStub.java
similarity index 100%
rename from provider/storage-gcp/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/config/PullConfigStub.java
rename to provider/storage-gc/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/config/PullConfigStub.java
diff --git a/provider/storage-gcp/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/stub/OqmPubSubStub.java b/provider/storage-gc/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/stub/OqmPubSubStub.java
similarity index 100%
rename from provider/storage-gcp/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/stub/OqmPubSubStub.java
rename to provider/storage-gc/src/test/java/org/opengroup/osdu/storage/provider/gcp/messaging/jobs/stub/OqmPubSubStub.java
diff --git a/provider/storage-gcp/src/test/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapperTest.java b/provider/storage-gc/src/test/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapperTest.java
similarity index 100%
rename from provider/storage-gcp/src/test/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapperTest.java
rename to provider/storage-gc/src/test/java/org/opengroup/osdu/storage/provider/gcp/web/middleware/GcpExceptionMapperTest.java
diff --git a/testing/pom.xml b/testing/pom.xml
index 948a40736..b1808e325 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -33,7 +33,7 @@
 		<module>storage-test-core</module>
 		<module>storage-test-aws</module>
 		<module>storage-test-azure</module>
-		<module>storage-test-gcp</module>
+		<module>storage-test-gc</module>
 		<module>storage-test-ibm</module>
         <module>storage-test-anthos</module>
     </modules>
diff --git a/testing/storage-test-gcp/pom.xml b/testing/storage-test-gc/pom.xml
similarity index 99%
rename from testing/storage-test-gcp/pom.xml
rename to testing/storage-test-gc/pom.xml
index e968b09c9..840b1ac50 100644
--- a/testing/storage-test-gcp/pom.xml
+++ b/testing/storage-test-gc/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opengroup.osdu.storage</groupId>
-    <artifactId>storage-test-gcp</artifactId>
+    <artifactId>storage-test-gc</artifactId>
     <version>0.19.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/util/GCPTestUtils.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/util/GCPTestUtils.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/util/GCPTestUtils.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/util/GCPTestUtils.java
diff --git a/testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/util/GoogleServiceAccount.java b/testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/util/GoogleServiceAccount.java
similarity index 100%
rename from testing/storage-test-gcp/src/test/java/org/opengroup/osdu/storage/util/GoogleServiceAccount.java
rename to testing/storage-test-gc/src/test/java/org/opengroup/osdu/storage/util/GoogleServiceAccount.java
diff --git a/testing/storage-test-gcp/src/test/resources/logback-test.xml b/testing/storage-test-gc/src/test/resources/logback-test.xml
similarity index 100%
rename from testing/storage-test-gcp/src/test/resources/logback-test.xml
rename to testing/storage-test-gc/src/test/resources/logback-test.xml
diff --git a/testing/storage-test-gcp/src/test/resources/test.properties b/testing/storage-test-gc/src/test/resources/test.properties
similarity index 100%
rename from testing/storage-test-gcp/src/test/resources/test.properties
rename to testing/storage-test-gc/src/test/resources/test.properties
-- 
GitLab