Repository: deislabs/ratify
Pull request #940 (2023-07-20 07:49:42)

chore!: update-notation ref
Description
What this PR does / why we need it:
Update the references of Notation

Which issue(s) this PR fixes:
Fixes https://github.com/deislabs/ratify/issues/703

Type of change
Please delete options that are not relevant.

 verifier, notation-issuer-validation related
 certs, signs
 others (including policy, scripts, tests) & doc
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Please also list any relevant details for your test configuration

 go through CIs

codecov[bot]: ## [Codecov](https://app.codecov.io/gh/deislabs/ratify/pull/940?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs) Report
Patch coverage: **`100.00`**% and no project coverage change.
> Comparison is base [(`1ae145c`)](https://app.codecov.io/gh/deislabs/ratify/commit/1ae145c4b9cfe3b69d3ecbb89ad5083c6bc3ac2e?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs) 56.33% compared to head [(`864c6ac`)](https://app.codecov.io/gh/deislabs/ratify/pull/940?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs) 56.33%.

<details><summary>Additional details and impacted files</summary>


```diff
@@           Coverage Diff           @@
##             main     #940   +/-   ##
=======================================
  Coverage   56.33%   56.33%           
=======================================
  Files          69       69           
  Lines        4049     4049           
=======================================
  Hits         2281     2281           
  Misses       1547     1547           
  Partials      221      221           
```


| [Impacted Files](https://app.codecov.io/gh/deislabs/ratify/pull/940?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs) | Coverage Δ | |
|---|---|---|
| [pkg/verifier/notation/pluginmanager.go](https://app.codecov.io/gh/deislabs/ratify/pull/940?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs#diff-cGtnL3ZlcmlmaWVyL25vdGF0aW9uL3BsdWdpbm1hbmFnZXIuZ28=) | `65.38% <ø> (ø)` | |
| [pkg/verifier/notation/truststore.go](https://app.codecov.io/gh/deislabs/ratify/pull/940?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs#diff-cGtnL3ZlcmlmaWVyL25vdGF0aW9uL3RydXN0c3RvcmUuZ28=) | `77.50% <ø> (ø)` | |
| [pkg/utils/certificateUtils.go](https://app.codecov.io/gh/deislabs/ratify/pull/940?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs#diff-cGtnL3V0aWxzL2NlcnRpZmljYXRlVXRpbHMuZ28=) | `69.49% <100.00%> (ø)` | |
| [pkg/verifier/notation/notation.go](https://app.codecov.io/gh/deislabs/ratify/pull/940?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs#diff-cGtnL3ZlcmlmaWVyL25vdGF0aW9uL25vdGF0aW9uLmdv) | `86.04% <100.00%> (ø)` | |


</details>

[:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/deislabs/ratify/pull/940?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs).   
:loudspeaker: Do you have feedback about the report comment? [Let us know in this issue](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=deislabs).

binbin-li: @yizha1 fyi
susanshi: thanks for the PR @junczhu , the e2e is unblocked now. Could you help to resolve the conflict? 

Patch:
diff --git a/.devcontainer/config.default.json b/.devcontainer/config.default.json
index 87835f0..5c66638 100644
--- a/.devcontainer/config.default.json
+++ b/.devcontainer/config.default.json
@@ -21,7 +21,7 @@
     "version": "1.0.0",
     "plugins": [
       {
-        "name": "notaryv2",
+        "name": "notation",
         "artifactTypes": "application/vnd.cncf.notary.signature",
         "trustPolicyDoc": {
           "version": "1.0",
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index 739b58f..51c1ec7 100755
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -13,8 +13,8 @@ if [ ! -f ~/.ratify/config.json ]; then
 fi
 
 # create the sample cert so that the default launch task works by default
-mkdir -p ~/.ratify/ratify-certs/notary/truststore/x509/ca/certs
-cp ./test/bats/tests/certificates/wabbit-networks.io.crt ~/.ratify/ratify-certs/notary/truststore/x509/ca/certs/wabbit-networks.io.crt
+mkdir -p ~/.ratify/ratify-certs/notation/truststore/x509/ca/certs
+cp ./test/bats/tests/certificates/wabbit-networks.io.crt ~/.ratify/ratify-certs/notation/truststore/x509/ca/certs/wabbit-networks.io.crt
 
 mkdir -p ~/.ratify/ratify-certs/cosign
 cp ./test/bats/tests/certificates/cosign.pub ~/.ratify/ratify-certs/cosign/cosign.pub
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 43bafe9..a5232d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -220,7 +220,7 @@ Gatekeeper requires TLS for external data provider interactions. As such ratify
     helm install ratify \
       ./charts/ratify --atomic \
       --namespace gatekeeper-system \
-      --set-file notaryCert=./test/testdata/notary.crt \
+      --set-file notationCert=./test/testdata/notation.crt \
       --set-file provider.tls.crt=./tls/certs/tls.crt \
       --set-file provider.tls.key=./tls/certs/tls.key \
       --set-file provider.tls.cabundle=./tls/certs/ca.crt
diff --git a/Makefile b/Makefile
index c5cf7a7..8dac3e8 100644
--- a/Makefile
+++ b/Makefile
@@ -71,13 +71,13 @@ build-plugins:
 install:
 	mkdir -p ${INSTALL_DIR}
 	mkdir -p ${INSTALL_DIR}/ratify-certs/cosign
-	mkdir -p ${INSTALL_DIR}/ratify-certs/notary
+	mkdir -p ${INSTALL_DIR}/ratify-certs/notation
 	cp -r ./bin/* ${INSTALL_DIR}
 
 .PHONY: ratify-config
 ratify-config:
 	cp ./test/bats/tests/config/* ${INSTALL_DIR}
-	cp ./test/bats/tests/certificates/wabbit-networks.io.crt ${INSTALL_DIR}/ratify-certs/notary/wabbit-networks.io.crt
+	cp ./test/bats/tests/certificates/wabbit-networks.io.crt ${INSTALL_DIR}/ratify-certs/notation/wabbit-networks.io.crt
 	cp ./test/bats/tests/certificates/cosign.pub ${INSTALL_DIR}/ratify-certs/cosign/cosign.pub
 	cp -r ./test/bats/tests/schemas/ ${INSTALL_DIR}
 	
@@ -137,7 +137,7 @@ test-e2e: generate-rotation-certs
 	EXPIRING_CERT_DIR=.staging/rotation/expiring-certs GATEKEEPER_VERSION=${GATEKEEPER_VERSION} bats -t ${BATS_PLUGIN_TESTS_FILE}
 
 .PHONY: test-e2e-cli
-test-e2e-cli: e2e-dependencies e2e-create-local-registry e2e-notaryv2-setup e2e-notation-leaf-cert-setup e2e-cosign-setup e2e-licensechecker-setup e2e-sbom-setup e2e-schemavalidator-setup
+test-e2e-cli: e2e-dependencies e2e-create-local-registry e2e-notation-setup e2e-notation-leaf-cert-setup e2e-cosign-setup e2e-licensechecker-setup e2e-sbom-setup e2e-schemavalidator-setup
 	rm ${GOCOVERDIR} -rf
 	mkdir ${GOCOVERDIR} -p
 	RATIFY_DIR=${INSTALL_DIR} TEST_REGISTRY=${TEST_REGISTRY} ${GITHUB_WORKSPACE}/bin/bats -t ${BATS_CLI_TESTS_FILE}
@@ -252,14 +252,14 @@ e2e-docker-credential-store-setup:
 	gpg --batch --passphrase '' --quick-gen-key ratify default default
 	pass init $$(gpg --list-keys ratify | sed -n 2p | tr -d " \t\n\r")
 
-e2e-notaryv2-setup:
-	rm -rf .staging/notaryv2
-	mkdir -p .staging/notaryv2
-	curl -L https://github.com/notaryproject/notation/releases/download/v${NOTATION_VERSION}/notation_${NOTATION_VERSION}_linux_amd64.tar.gz --output ${GITHUB_WORKSPACE}/.staging/notaryv2/notation.tar.gz
-	tar -zxvf ${GITHUB_WORKSPACE}/.staging/notaryv2/notation.tar.gz -C ${GITHUB_WORKSPACE}/.staging/notaryv2
+e2e-notation-setup:
+	rm -rf .staging/notation
+	mkdir -p .staging/notation
+	curl -L https://github.com/notaryproject/notation/releases/download/v${NOTATION_VERSION}/notation_${NOTATION_VERSION}_linux_amd64.tar.gz --output ${GITHUB_WORKSPACE}/.staging/notation/notation.tar.gz
+	tar -zxvf ${GITHUB_WORKSPACE}/.staging/notation/notation.tar.gz -C ${GITHUB_WORKSPACE}/.staging/notation
 
-	printf 'FROM ${ALPINE_IMAGE}\nCMD ["echo", "notaryv2 signed image"]' > .staging/notaryv2/Dockerfile
-	docker build --no-cache -t ${TEST_REGISTRY}/notation:signed .staging/notaryv2
+	printf 'FROM ${ALPINE_IMAGE}\nCMD ["echo", "notation signed image"]' > .staging/notation/Dockerfile
+	docker build --no-cache -t ${TEST_REGISTRY}/notation:signed .staging/notation
 	docker push ${TEST_REGISTRY}/notation:signed
 
 	docker pull ${LOCAL_UNSIGNED_IMAGE}
@@ -267,25 +267,25 @@ e2e-notaryv2-setup:
 	docker push ${TEST_REGISTRY}/notation:unsigned
 
 	rm -rf ~/.config/notation
-	.staging/notaryv2/notation cert generate-test --default "ratify-bats-test"
+	.staging/notation/notation cert generate-test --default "ratify-bats-test"
 
-	.staging/notaryv2/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} `docker image inspect ${TEST_REGISTRY}/notation:signed | jq -r .[0].RepoDigests[0]`
-	.staging/notaryv2/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} `docker image inspect ${TEST_REGISTRY}/all:v0 | jq -r .[0].RepoDigests[0]`
+	.staging/notation/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} `docker image inspect ${TEST_REGISTRY}/notation:signed | jq -r .[0].RepoDigests[0]`
+	.staging/notation/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} `docker image inspect ${TEST_REGISTRY}/all:v0 | jq -r .[0].RepoDigests[0]`
 
 e2e-notation-leaf-cert-setup:
-	mkdir -p .staging/notaryv2/leaf-test
+	mkdir -p .staging/notation/leaf-test
 	mkdir -p ~/.config/notation/truststore/x509/ca/leaf-test
-	./scripts/generate-cert-chain.sh .staging/notaryv2/leaf-test
-	cp .staging/notaryv2/leaf-test/leaf.crt ~/.config/notation/truststore/x509/ca/leaf-test/leaf.crt
-	cp .staging/notaryv2/leaf-test/ca.crt ~/.config/notation/truststore/x509/ca/leaf-test/root.crt
-	cat .staging/notaryv2/leaf-test/ca.crt >> .staging/notaryv2/leaf-test/leaf.crt
+	./scripts/generate-cert-chain.sh .staging/notation/leaf-test
+	cp .staging/notation/leaf-test/leaf.crt ~/.config/notation/truststore/x509/ca/leaf-test/leaf.crt
+	cp .staging/notation/leaf-test/ca.crt ~/.config/notation/truststore/x509/ca/leaf-test/root.crt
+	cat .staging/notation/leaf-test/ca.crt >> .staging/notation/leaf-test/leaf.crt
 
-	jq '.keys += [{"name":"leaf-test","keyPath":".staging/notaryv2/leaf-test/leaf.key","certPath":".staging/notaryv2/leaf-test/leaf.crt"}]' ~/.config/notation/signingkeys.json > tmp && mv tmp ~/.config/notation/signingkeys.json
+	jq '.keys += [{"name":"leaf-test","keyPath":".staging/notation/leaf-test/leaf.key","certPath":".staging/notation/leaf-test/leaf.crt"}]' ~/.config/notation/signingkeys.json > tmp && mv tmp ~/.config/notation/signingkeys.json
 
-	printf 'FROM ${ALPINE_IMAGE}\nCMD ["echo", "notaryv2 leaf signed image"]' > .staging/notaryv2/Dockerfile
-	docker build --no-cache -t ${TEST_REGISTRY}/notation:leafSigned .staging/notaryv2
+	printf 'FROM ${ALPINE_IMAGE}\nCMD ["echo", "notation leaf signed image"]' > .staging/notation/Dockerfile
+	docker build --no-cache -t ${TEST_REGISTRY}/notation:leafSigned .staging/notation
 	docker push ${TEST_REGISTRY}/notation:leafSigned
-	.staging/notaryv2/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} --key "leaf-test" `docker image inspect ${TEST_REGISTRY}/notation:leafSigned | jq -r .[0].RepoDigests[0]`
+	.staging/notation/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} --key "leaf-test" `docker image inspect ${TEST_REGISTRY}/notation:leafSigned | jq -r .[0].RepoDigests[0]`
 
 e2e-cosign-setup:
 	rm -rf .staging/cosign
@@ -362,8 +362,8 @@ e2e-sbom-setup:
 		.staging/sbom/_manifest/spdx_2.2/manifest.spdx.json:application/spdx+json
 
 	# Push Signature to sbom
-	.staging/notaryv2/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} ${TEST_REGISTRY}/sbom@`oras discover -o json --artifact-type org.example.sbom.v0 ${TEST_REGISTRY}/sbom:v0 | jq -r ".manifests[0].digest"`
-	.staging/notaryv2/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} ${TEST_REGISTRY}/all@`oras discover -o json --artifact-type org.example.sbom.v0 ${TEST_REGISTRY}/all:v0 | jq -r ".manifests[0].digest"` 
+	.staging/notation/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} ${TEST_REGISTRY}/sbom@`oras discover -o json --artifact-type org.example.sbom.v0 ${TEST_REGISTRY}/sbom:v0 | jq -r ".manifests[0].digest"`
+	.staging/notation/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} ${TEST_REGISTRY}/all@`oras discover -o json --artifact-type org.example.sbom.v0 ${TEST_REGISTRY}/all:v0 | jq -r ".manifests[0].digest"` 
 
 e2e-schemavalidator-setup:
 	rm -rf .staging/schemavalidator
@@ -394,14 +394,14 @@ e2e-inlinecert-setup:
 	mkdir -p .staging/inlinecert
 
 	# build and sign an image with an alternate certificate
-	printf 'FROM ${ALPINE_IMAGE}\nCMD ["echo", "alternate notaryv2 signed image"]' > .staging/inlinecert/Dockerfile
+	printf 'FROM ${ALPINE_IMAGE}\nCMD ["echo", "alternate notation signed image"]' > .staging/inlinecert/Dockerfile
 	docker build --no-cache -t ${TEST_REGISTRY}/notation:signed-alternate .staging/inlinecert
 	docker push ${TEST_REGISTRY}/notation:signed-alternate
 
-	.staging/notaryv2/notation cert generate-test "alternate-cert"
-	.staging/notaryv2/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} --key "alternate-cert" `docker image inspect ${TEST_REGISTRY}/notation:signed-alternate | jq -r .[0].RepoDigests[0]`
+	.staging/notation/notation cert generate-test "alternate-cert"
+	.staging/notation/notation sign -u ${TEST_REGISTRY_USERNAME} -p ${TEST_REGISTRY_PASSWORD} --key "alternate-cert" `docker image inspect ${TEST_REGISTRY}/notation:signed-alternate | jq -r .[0].RepoDigests[0]`
 
-e2e-azure-setup: e2e-create-all-image e2e-notaryv2-setup e2e-notation-leaf-cert-setup e2e-cosign-setup e2e-licensechecker-setup e2e-sbom-setup e2e-schemavalidator-setup
+e2e-azure-setup: e2e-create-all-image e2e-notation-setup e2e-notation-leaf-cert-setup e2e-cosign-setup e2e-licensechecker-setup e2e-sbom-setup e2e-schemavalidator-setup
 
 e2e-deploy-gatekeeper: e2e-helm-install
 	./.staging/helm/linux-amd64/helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts
@@ -418,7 +418,7 @@ e2e-build-crd-image:
 	docker build --progress=plain --no-cache --build-arg KUBE_VERSION=${KUBERNETES_VERSION} --build-arg TARGETOS="linux" --build-arg TARGETARCH="amd64" -f crd.Dockerfile -t localbuildcrd:test ./charts/ratify/crds
 	kind load docker-image --name kind localbuildcrd:test
 
-e2e-deploy-base-ratify: e2e-notaryv2-setup e2e-notation-leaf-cert-setup e2e-inlinecert-setup e2e-build-crd-image
+e2e-deploy-base-ratify: e2e-notation-setup e2e-notation-leaf-cert-setup e2e-inlinecert-setup e2e-build-crd-image
 	docker build --progress=plain --no-cache \
 	-f ./httpserver/Dockerfile \
 	-t baselocalbuild:test .
@@ -438,7 +438,7 @@ e2e-deploy-base-ratify: e2e-notaryv2-setup e2e-notation-leaf-cert-setup e2e-inli
 	--set-file provider.tls.caCert=${CERT_DIR}/ca.crt \
     --set-file provider.tls.caKey=${CERT_DIR}/ca.key \
 	--set provider.tls.cabundle="$(shell cat ${CERT_DIR}/ca.crt | base64 | tr -d '\n')" \
-	--set notaryCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
+	--set notationCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
 	--set oras.useHttp=true \
 	--set cosign.enabled=false \
 	--set-file dockerConfig="mount_config.json" \
@@ -446,7 +446,7 @@ e2e-deploy-base-ratify: e2e-notaryv2-setup e2e-notation-leaf-cert-setup e2e-inli
 
 	rm mount_config.json
 
-e2e-deploy-ratify: e2e-notaryv2-setup e2e-notation-leaf-cert-setup e2e-cosign-setup e2e-cosign-setup e2e-licensechecker-setup e2e-sbom-setup e2e-schemavalidator-setup e2e-inlinecert-setup e2e-build-crd-image e2e-build-local-ratify-image e2e-helm-deploy-ratify
+e2e-deploy-ratify: e2e-notation-setup e2e-notation-leaf-cert-setup e2e-cosign-setup e2e-cosign-setup e2e-licensechecker-setup e2e-sbom-setup e2e-schemavalidator-setup e2e-inlinecert-setup e2e-build-crd-image e2e-build-local-ratify-image e2e-helm-deploy-ratify
 
 e2e-build-local-ratify-image:
 	docker build --progress=plain --no-cache \
@@ -473,7 +473,7 @@ e2e-helm-deploy-ratify:
 	--set-file provider.tls.caCert=${CERT_DIR}/ca.crt \
     --set-file provider.tls.caKey=${CERT_DIR}/ca.key \
 	--set provider.tls.cabundle="$(shell cat ${CERT_DIR}/ca.crt | base64 | tr -d '\n')" \
-	--set notaryCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
+	--set notationCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
 	--set cosign.key="$$(cat .staging/cosign/cosign.pub)" \
 	--set oras.useHttp=true \
 	--set-file dockerConfig="mount_config.json" \
@@ -498,7 +498,7 @@ e2e-helm-deploy-redis: e2e-helm-deploy-dapr
 	kubectl apply -f test/testdata/dapr/dapr-redis-secret.yaml -n ${GATEKEEPER_NAMESPACE}
 	kubectl apply -f test/testdata/dapr/dapr-redis.yaml -n ${GATEKEEPER_NAMESPACE}
  
-e2e-helm-deploy-ratify-replica: e2e-helm-deploy-redis e2e-notaryv2-setup e2e-build-crd-image e2e-build-local-ratify-image
+e2e-helm-deploy-ratify-replica: e2e-helm-deploy-redis e2e-notation-setup e2e-build-crd-image e2e-build-local-ratify-image
 	printf "{\n\t\"auths\": {\n\t\t\"registry:5000\": {\n\t\t\t\"auth\": \"`echo "${TEST_REGISTRY_USERNAME}:${TEST_REGISTRY_PASSWORD}" | tr -d '\n' | base64 -i -w 0`\"\n\t\t}\n\t}\n}" > mount_config.json
 
 	./.staging/helm/linux-amd64/helm install ${RATIFY_NAME} \
@@ -513,7 +513,7 @@ e2e-helm-deploy-ratify-replica: e2e-helm-deploy-redis e2e-notaryv2-setup e2e-bui
 	--set-file provider.tls.caCert=${CERT_DIR}/ca.crt \
     --set-file provider.tls.caKey=${CERT_DIR}/ca.key \
 	--set provider.tls.cabundle="$(shell cat ${CERT_DIR}/ca.crt | base64 | tr -d '\n')" \
-	--set notaryCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
+	--set notationCert="$$(cat ~/.config/notation/localkeys/ratify-bats-test.crt)" \
 	--set oras.useHttp=true \
 	--set cosign.enabled=false \
 	--set-file dockerConfig="mount_config.json" \
diff --git a/README.md b/README.md
index 2360bd6..23f09a1 100644
--- a/README.md
+++ b/README.md
@@ -117,4 +117,4 @@ This project is released under the [Apache-2.0 License](./LICENSE).
 
 This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow [Microsoft's Trademark & Brand Guidelines][microsoft-trademark]. Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. Any use of third-party trademarks or logos are subject to those third-party's policies.
 
-[microsoft-trademark]: https://www.microsoft.com/legal/intellectualproperty/trademarks
+[microsoft-trademark]: https://www.microsoft.com/legal/intellectualproperty/trademarks
\ No newline at end of file
diff --git a/RELEASES.md b/RELEASES.md
index 39fab6f..3937388 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -81,6 +81,6 @@ helm install ratify \
     --set image.repository=ghcr.io/deislabs/ratify-dev
     --set image.crdRepository=ghcr.io/deislabs/ratify-crds-dev
     --set image.tag=dev.<YYYYMMDD>.<ABBREVIATED_GIT_HASH_COMMIT>
-    --set-file notaryCert=./test/testdata/notary.crt
+    --set-file notationCert=./test/testdata/notation.crt
 ```
 NOTE: the tag field is the only value that will change when updating to newer dev build images
\ No newline at end of file
diff --git a/charts/ratify/templates/configmap.yaml b/charts/ratify/templates/configmap.yaml
index dd82594..52d9e38 100644
--- a/charts/ratify/templates/configmap.yaml
+++ b/charts/ratify/templates/configmap.yaml
@@ -64,14 +64,14 @@ data:
           "version": "1.0.0",
           "plugins": [
             {
-                "name":"notaryv2",
+                "name":"notation",
                 "artifactTypes" : "application/vnd.cncf.notary.signature",
                 "verificationCertStores": {
                   "certs":[
                     {{- if .Values.akvCertConfig.enabled }}
                     "certstore-akv"
                     {{- else }}
-                    "{{ include "ratify.fullname" . }}-notary-inline-cert"
+                    "{{ include "ratify.fullname" . }}-notation-inline-cert"
                     {{- end }}
                    ]
                 },
diff --git a/charts/ratify/templates/inline-certificate-provider.yaml b/charts/ratify/templates/inline-certificate-provider.yaml
index 6486013..bf89c31 100644
--- a/charts/ratify/templates/inline-certificate-provider.yaml
+++ b/charts/ratify/templates/inline-certificate-provider.yaml
@@ -1,13 +1,13 @@
-{{- if .Values.notaryCert }} 
+{{- if .Values.notationCert }} 
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: CertificateStore
 metadata:
-  name: {{ include "ratify.fullname" . }}-notary-inline-cert
+  name: {{ include "ratify.fullname" . }}-notation-inline-cert
   annotations:
     helm.sh/hook: pre-install,pre-upgrade
     helm.sh/hook-weight: "5"
 spec:
   provider: inline
   parameters:
-    value: {{ .Values.notaryCert | quote }}
+    value: {{ .Values.notationCert | quote }}
 {{- end }}
diff --git a/charts/ratify/templates/verifier.yaml b/charts/ratify/templates/verifier.yaml
index 44c581b..a3547e0 100644
--- a/charts/ratify/templates/verifier.yaml
+++ b/charts/ratify/templates/verifier.yaml
@@ -1,12 +1,12 @@
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
   annotations:
     helm.sh/hook: pre-install,pre-upgrade
     helm.sh/hook-weight: "5"
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
     
@@ -15,7 +15,7 @@ spec:
         {{- if .Values.akvCertConfig.enabled }}
         - certstore-akv
         {{- else }}
-        - {{ include "ratify.fullname" . }}-notary-inline-cert
+        - {{ include "ratify.fullname" . }}-notation-inline-cert
         {{- end }}
     trustPolicyDoc:
       version: "1.0"
diff --git a/charts/ratify/values.yaml b/charts/ratify/values.yaml
index 5b78163..d18e182 100644
--- a/charts/ratify/values.yaml
+++ b/charts/ratify/values.yaml
@@ -8,7 +8,7 @@ nameOverride: ""
 fullnameOverride: ""
 logLevel: info
 replicaCount: 1
-notaryCert: ""
+notationCert: ""
 cosign:
   enabled: true
   key: ""
diff --git a/cmd/ratify/main.go b/cmd/ratify/main.go
index e85cada..10f1373 100644
--- a/cmd/ratify/main.go
+++ b/cmd/ratify/main.go
@@ -24,7 +24,7 @@ import (
 	_ "github.com/deislabs/ratify/pkg/policyprovider/configpolicy" // register configpolicy policy provider
 	_ "github.com/deislabs/ratify/pkg/policyprovider/regopolicy"   // register regopolicy policy provider
 	_ "github.com/deislabs/ratify/pkg/referrerstore/oras"          // register oras referrer store
-	_ "github.com/deislabs/ratify/pkg/verifier/notaryv2"           // register notaryv2 verifier
+	_ "github.com/deislabs/ratify/pkg/verifier/notation"           // register notation verifier
 )
 
 func main() {
diff --git a/config/config.json b/config/config.json
index d630f0c..e7ae3ee 100644
--- a/config/config.json
+++ b/config/config.json
@@ -22,10 +22,10 @@
         "version": "1.0.0",
         "plugins": [
             {
-                "name": "notaryv2",
+                "name": "notation",
                 "artifactTypes": "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
-                    "/usr/local/ratify-certs/notary/truststore"
+                    "/usr/local/ratify-certs/notation/truststore"
                 ],
                 "trustPolicyDoc": {
                     "version": "1.0",
diff --git a/config/samples/config_v1alpha1_verifier_notary.yaml b/config/samples/config_v1alpha1_verifier_notation.yaml
similarity index 85%
rename from config/samples/config_v1alpha1_verifier_notary.yaml
rename to config/samples/config_v1alpha1_verifier_notation.yaml
index be676ab..a182cdf 100644
--- a/config/samples/config_v1alpha1_verifier_notary.yaml
+++ b/config/samples/config_v1alpha1_verifier_notation.yaml
@@ -1,14 +1,14 @@
 apiVersion: config.ratify.deislabs.io/v1alpha1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
      verificationCertStores:
        certs:
-         - ratify-notary-inline-cert
+         - ratify-notation-inline-cert
      trustPolicyDoc:
       version: "1.0"
       trustPolicies:
diff --git a/config/samples/config_v1beta1_verifier_notary.yaml b/config/samples/config_v1beta1_verifier_notation.yaml
similarity index 85%
rename from config/samples/config_v1beta1_verifier_notary.yaml
rename to config/samples/config_v1beta1_verifier_notation.yaml
index 822c3ef..05ef8f0 100644
--- a/config/samples/config_v1beta1_verifier_notary.yaml
+++ b/config/samples/config_v1beta1_verifier_notation.yaml
@@ -1,14 +1,14 @@
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
      verificationCertStores:
        certs:
-         - ratify-notary-inline-cert
+         - ratify-notation-inline-cert
      trustPolicyDoc:
       version: "1.0"
       trustPolicies:
diff --git a/config/samples/config_v1beta1_verifier_notary_certstore.yaml b/config/samples/config_v1beta1_verifier_notation_certstore.yaml
similarity index 93%
rename from config/samples/config_v1beta1_verifier_notary_certstore.yaml
rename to config/samples/config_v1beta1_verifier_notation_certstore.yaml
index 7ee12c0..ec79999 100644
--- a/config/samples/config_v1beta1_verifier_notary_certstore.yaml
+++ b/config/samples/config_v1beta1_verifier_notation_certstore.yaml
@@ -1,9 +1,9 @@
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
     verificationCertStores:
diff --git a/docs/quickstarts/gatekeeper-policy-authoring.md b/docs/quickstarts/gatekeeper-policy-authoring.md
index d29bc2e..63cc8d9 100644
--- a/docs/quickstarts/gatekeeper-policy-authoring.md
+++ b/docs/quickstarts/gatekeeper-policy-authoring.md
@@ -40,7 +40,7 @@ artifacts:
 ```
 localhost:5000/net-monitor:v1
     - sbom
-    - notaryv2 signature
+    - notation signature
     - cosign signature
 ```
 
@@ -100,7 +100,7 @@ actual values of fields may differ):
             },
             "isSuccess": true,
             "message": "signature verification success",
-            "name": "notaryv2",
+            "name": "notation",
             "subject": "localhost:5000/net-monitor:v1"
           },
           {
@@ -159,28 +159,28 @@ The most commonly used fields are:
 - `Extensions`: Additional metadata added to the result by the verifier
 
 The `Extensions` field allows the verifiers to include additional metadata as
-part of the response to use for policy evaluation (for example, the notaryv2
+part of the response to use for policy evaluation (for example, the notation
 verifier includes the Issuer and SubjectName from the certificate as an extension field).
 Currently, the best way to determine the extension fields for a verifier is to
 check the source for that verifier.
 
 When Ratify is verifying against a notation signature, there might be ambiguity
-in the verifierReport from notary verifier. Notary verifier introduces 
+in the verifierReport from notation verifier. Notation verifier introduces 
 a [trust policy](https://github.com/notaryproject/notaryproject/blob/main/specs/trust-store-trust-policy.md#trust-policy) component in the rc.1 release. Users 
 could control the verification level and scopes applied to specified artifact. There 
 could be 2 scenarios needed to pay attention:
 
 1. If users forgot to set up scopes
-for some repositories/artifacts, then the verification result from notary verifier will be an error saying the policy is missing.
+for some repositories/artifacts, then the verification result from notation verifier will be an error saying the policy is missing.
 2. If users set the verification level in trust policy to any value except `strict`,
-then the notary verification result might be a success even though some underlying
+then the notation verification result might be a success even though some underlying
 validation failed. Check the verification level provided in notation for more information: [Signature Verification Level](https://github.com/notaryproject/notaryproject/blob/main/specs/trust-store-trust-policy.md#signature-verification-details)
 
 ## Sample Rego Policy
 Let's look at a Ratify policy from the library in more detail. Below is the
-rego from the `notaryv2issuervalidation` policy:
+rego from the `notationissuervalidation` policy:
 ```rego
-package notaryv2issuervalidation
+package notationissuervalidation
 
 # Get data from Ratify
 remote_data := response {
@@ -217,8 +217,8 @@ general_violation[{"result": result}] {
 general_violation[{"result": result}] {
   subject_results := remote_data.responses[_]
   subject_result := subject_results[1]
-  notaryv2_results := [res | subject_result.verifierReports[i].name == "notaryv2"; res := subject_result.verifierReports[i]]
-  issuer_results := [res | notaryv2_results[i].extensions.Issuer == input.parameters.issuer; res := notaryv2_results[i]]
+  notation_results := [res | subject_result.verifierReports[i].name == "notation"; res := subject_result.verifierReports[i]]
+  issuer_results := [res | notation_results[i].extensions.Issuer == input.parameters.issuer; res := notation_results[i]]
   count(issuer_results) == 0
   result := sprintf("Subject %s has no signatures for certificate with Issuer: %s", [subject_results[0], input.parameters.issuer])
 }
@@ -227,11 +227,11 @@ general_violation[{"result": result}] {
 general_violation[{"result": result}] {
   subject_results := remote_data.responses[_]
   subject_result := subject_results[1]
-  notaryv2_results := [res | subject_result.verifierReports[i].name == "notaryv2"; res := subject_result.verifierReports[i]]
-  notaryv2_result := notaryv2_results[_]
-  notaryv2_result.isSuccess == false
-  notaryv2_result.extensions.Issuer == input.parameters.issuer
-  result = sprintf("Subject %s failed signature validation: %s", [subject_results[0], notaryv2_result.message])
+  notation_results := [res | subject_result.verifierReports[i].name == "notation"; res := subject_result.verifierReports[i]]
+  notation_result := notation_results[_]
+  notation_result.isSuccess == false
+  notation_result.extensions.Issuer == input.parameters.issuer
+  result = sprintf("Subject %s failed signature validation: %s", [subject_results[0], notation_result.message])
 }
 ```
 
diff --git a/docs/quickstarts/ratify-high-availability.md b/docs/quickstarts/ratify-high-availability.md
index 7991acb..dfbe841 100644
--- a/docs/quickstarts/ratify-high-availability.md
+++ b/docs/quickstarts/ratify-high-availability.md
@@ -106,12 +106,12 @@ kubectl apply -f dapr-redis.yaml -n gatekeeper-system
 
 ### Install Ratify
 ```bash
-# download the notary verification certificate
-curl -sSLO https://raw.githubusercontent.com/deislabs/ratify/main/test/testdata/notary.crt
+# download the notation verification certificate
+curl -sSLO https://raw.githubusercontent.com/deislabs/ratify/main/test/testdata/notation.crt
 helm install ratify \
     ratify/ratify --atomic \
     --namespace gatekeeper-system \
-    --set-file notaryCert=./notary.crt \
+    --set-file notationCert=./notation.crt \
     --set featureFlags.RATIFY_CERT_ROTATION=true \
     --set featureFlags.RATIFY_DAPR_CACHE_PROVIDER=true \
     --set replicaCount=3 \
@@ -127,7 +127,7 @@ kubectl apply -f https://deislabs.github.io/ratify/library/default/template.yaml
 kubectl apply -f https://deislabs.github.io/ratify/library/default/samples/constraint.yaml
 ```
 
-Once the installation is completed, you can test the deployment of an image that is signed using Notary V2 solution.
+Once the installation is completed, you can test the deployment of an image that is signed using notation.
 
 - This will successfully create the pod `demo`
 
diff --git a/docs/quickstarts/ratify-on-aws.md b/docs/quickstarts/ratify-on-aws.md
index 95955ab..4fe6d22 100644
--- a/docs/quickstarts/ratify-on-aws.md
+++ b/docs/quickstarts/ratify-on-aws.md
@@ -215,7 +215,7 @@ notation cert list
 
 helm install ratify ratify/ratify --atomic \
     --namespace gatekeeper-system \
-    --set-file notaryCert=path/to/wabbit-networks.io.crt
+    --set-file notationCert=path/to/wabbit-networks.io.crt
 ```
 
 After deploying Ratify, we can apply the default Gatekeeper policy and constraint:
diff --git a/docs/quickstarts/ratify-on-azure.md b/docs/quickstarts/ratify-on-azure.md
index 12d8f91..d48cbda 100644
--- a/docs/quickstarts/ratify-on-azure.md
+++ b/docs/quickstarts/ratify-on-azure.md
@@ -17,7 +17,7 @@ In this article:
 
 ## Prerequisite
 
-Complete the steps in [Build, sign, and verify container images using Notary and Azure Key Vault (Preview)](https://learn.microsoft.com/en-us/azure/container-registry/container-registry-tutorial-sign-build-push#build-and-sign-a-container-image). Please note you need to have a signed image and configure the environment variables before getting started with the following steps.
+Complete the steps in [Build, sign, and verify container images using Notation and Azure Key Vault (Preview)](https://learn.microsoft.com/en-us/azure/container-registry/container-registry-tutorial-sign-build-push#build-and-sign-a-container-image). Please note you need to have a signed image and configure the environment variables before getting started with the following steps.
 
 ## Create and configure Azure Workload Identity
 
diff --git a/docs/quickstarts/ratify-with-aws-signer.md b/docs/quickstarts/ratify-with-aws-signer.md
index 7f95956..48443cb 100644
--- a/docs/quickstarts/ratify-with-aws-signer.md
+++ b/docs/quickstarts/ratify-with-aws-signer.md
@@ -195,14 +195,14 @@ kubectl -n gatekeeper-system get sa ratify-admin -oyaml
 
 ## Deploy Ratify
 
-Now we can deploy Ratify to our cluster with the AWS Signer root as the notary verification certificate:
+Now we can deploy Ratify to our cluster with the AWS Signer root as the notation verification certificate:
 ```shell
 curl -sSLO https://d2hvyiie56hcat.cloudfront.net/aws-signer-notation-root.cert
 
 helm install ratify \
     ratify/ratify --atomic \
     --namespace gatekeeper-system \
-    --set-file notaryCert=./aws-signer-notation-root.cert \
+    --set-file notationCert=./aws-signer-notation-root.cert \
     --set featureFlags.RATIFY_DYNAMIC_PLUGINS=true \
     --set serviceAccount.create=false \
     --set oras.authProviders.awsEcrBasicEnabled=true
@@ -233,14 +233,14 @@ cat > notation-verifier.yaml << EOF
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
     verificationCertStores:
       certs:
-        - ratify-notary-inline-cert
+        - ratify-notation-inline-cert
     trustPolicyDoc:
       version: "1.0"
       trustPolicies:
diff --git a/docs/reference/cache.md b/docs/reference/cache.md
index 0ffa2f1..a54d20d 100644
--- a/docs/reference/cache.md
+++ b/docs/reference/cache.md
@@ -12,7 +12,7 @@ See [docs](https://github.com/dgraph-io/ristretto).
 
 When to use Ristretto as the cache provider?
 - using the ratify quick start
-- only using ratify with notary verifier configured
+- only using ratify with notation verifier configured
 - using ratify as a single pod
 
 ### Dapr
diff --git a/docs/reference/crds/certificate-stores.md b/docs/reference/crds/certificate-stores.md
index a706290..a2e6d1f 100644
--- a/docs/reference/crds/certificate-stores.md
+++ b/docs/reference/crds/certificate-stores.md
@@ -19,7 +19,7 @@ status: # supported in version >= config.ratify.deislabs.io/v1beta1
 
 # Certificate Store Provider
 ## AzureKeyVault Certificate Provider
-See notary integration example [here](../../developer/verifier.md#section-6-built-in-verifiers)
+See notation integration example [here](../../developer/verifier.md#section-6-built-in-verifiers)
 ```yml
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: CertificateStore
diff --git a/docs/reference/crds/verifiers.md b/docs/reference/crds/verifiers.md
index 722bb72..11902f6 100644
--- a/docs/reference/crds/verifiers.md
+++ b/docs/reference/crds/verifiers.md
@@ -4,7 +4,7 @@ Ratify supports many verifiers to validate different artifact types. View more C
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
   name: required, name of the verifier
   artifactType: required, the type of artifact this verifier handles
@@ -15,16 +15,16 @@ spec:
 ```
  
 
-## Notary
+## Notation
 
-Sample Notary yaml spec:
+Sample Notation yaml spec:
 ```yml
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
     verificationCertStores:  # certificates for validating signatures
@@ -47,7 +47,7 @@ spec:
 
 | Name        | Required | Description | Default Value |
 | ----------- | -------- | ----------- | ------------- | 
-| verificationCerts      | no    |      An array of string. Notary verifier will load all certificates from path specified in this array        |   ""            |
+| verificationCerts      | no    |      An array of string. Notation verifier will load all certificates from path specified in this array        |   ""            |
 | verificationCertStores      | no    |    Defines a collection of cert store objects. This property supersedes the path defined in `verificationCerts`      |       ""        |
 | trustPolicyDoc   | yes     |   [Trust policy](https://github.com/notaryproject/notaryproject/blob/main/specs/trust-store-trust-policy.md) is a policy language that indicates which identities are trusted to produce artifacts.          |     ""    |
 
@@ -82,7 +82,7 @@ spec:
 ```
 | Name        | Required | Description | Default Value |
 | ----------- | -------- | ----------- | ------------- | 
-| nestedReferences      | no    | If nestedReferences contains any string value, the nested artifact will also be verified. For example, customer might want to enforce notary signatures on all sboms.|   ""            |
+| nestedReferences      | no    | If nestedReferences contains any string value, the nested artifact will also be verified. For example, customer might want to enforce notation signatures on all sboms.|   ""            |
 
 ## Schemavalidator
 
diff --git a/docs/reference/oras-auth-provider.md b/docs/reference/oras-auth-provider.md
index b779218..24d9e68 100644
--- a/docs/reference/oras-auth-provider.md
+++ b/docs/reference/oras-auth-provider.md
@@ -34,7 +34,7 @@ The `authProvider` section of configuration file specifies the authentication pr
         "version": "1.0.0",
         "plugins": [
             {
-                "name":"notaryv2",
+                "name":"notation",
                 "artifactTypes" : "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
                     "<cert folder>"
@@ -97,7 +97,7 @@ export ACR_NAME=<Azure Container Registry Name>
 export AKS_NAME=<Azure Kubernetes Service Name>
 export KEYVAULT_NAME=<Azure Key Vault Name>
 export RATIFY_NAMESPACE=<Namespace where Ratify deployed, defaults to "gatekeeper-system">
-export NOTARY_PEM_NAME=<Name of the certificate file uploaded to Azure Key Vault>
+export NOTATION_PEM_NAME=<Name of the certificate file uploaded to Azure Key Vault>
 ```
 
 2. Create a Workload Federated Identity.
@@ -220,7 +220,7 @@ Notes: add below options while installing Ratify
 --set azureWorkloadIdentity.clientId=${IDENTITY_CLIENT_ID} \
 --set akvCertConfig.enabled=true \
 --set akvCertConfig.vaultURI=${VAULT_URI} \
---set akvCertConfig.cert1Name=${NOTARY_PEM_NAME} \
+--set akvCertConfig.cert1Name=${NOTATION_PEM_NAME} \
 --set akvCertConfig.tenantId=${TENANT_ID}
 ```
 
@@ -249,7 +249,7 @@ kubectl create secret docker-registry ratify-regcred -n <ratify-namespace> --doc
 helm install ratify \
     ratify/ratify --atomic \
     --namespace gatekeeper-system \
-    --set-file notaryCert=./notary.crt \
+    --set-file notationCert=./notation.crt \
     --set oras.authProviders.k8secretsEnabled=true
 ```
 
diff --git a/docs/reference/providers.md b/docs/reference/providers.md
index c3e6342..3baa2b0 100644
--- a/docs/reference/providers.md
+++ b/docs/reference/providers.md
@@ -1,7 +1,7 @@
 # Store/Verifier Providers
 The framework uses a provider model for extensibility to support different types of referrer stores and verifiers. It supports two types of providers. 
 
-Built-In/Internal providers are available in the source of the framework and are registered during startup using the ```init``` function. Referrer store using [ORAS](https://github.com/oras-project/oras) and signature verification using [notaryv2](https://github.com/notaryproject/notation) are currently available as the built-in providers in the framework and are managed by the framework.
+Built-In/Internal providers are available in the source of the framework and are registered during startup using the ```init``` function. Referrer store using [ORAS](https://github.com/oras-project/oras) and signature verification using [notation](https://github.com/notaryproject/notation) are currently available as the built-in providers in the framework and are managed by the framework.
 
 External/Plugin providers are external to the source and process of the framework. They are registered as binaries that implement the plugin specification for the corresponding provider. The framework will locate these binaries in the configured paths and invoke them by passing the required parameters as per the specification. [SBOM](..\plugins\verifier\sbom) verification and signature verification using [cosign](..\plugins\verifier\cosign) libraries are examples of the providers that are implemented as plugins.
 
@@ -87,8 +87,8 @@ Here is a sample of the `input`:
           "referenceDigest": "test.azurecr.io/test/hello-world@sha256:33333",
           "verifierReports": [
             {
-              "verifierName": "notaryv2",
-              "verifierType": "verifier-notary",
+              "verifierName": "notation",
+              "verifierType": "verifier-notation",
               "isSuccess": true,
               "message": "",
               "extensions": {
diff --git a/docs/reference/ratify-configuration.md b/docs/reference/ratify-configuration.md
index 1e72b29..a9a18ed 100644
--- a/docs/reference/ratify-configuration.md
+++ b/docs/reference/ratify-configuration.md
@@ -32,5 +32,5 @@ kubectl apply -f .../ratify/config/samples/config_v1alpha1_verifier_schemavalida
 ```
 Sample command to remove a verifier:
 ```bash
-kubectl delete verifiers.config.ratify.deislabs.io/verifier-notary 
+kubectl delete verifiers.config.ratify.deislabs.io/verifier-notation 
 ```
\ No newline at end of file
diff --git a/docs/reference/ratify-framework-overview.md b/docs/reference/ratify-framework-overview.md
index af252cb..e3dd032 100644
--- a/docs/reference/ratify-framework-overview.md
+++ b/docs/reference/ratify-framework-overview.md
@@ -21,7 +21,7 @@ The framework defines concepts involved in the verification process and provides
 
 This framework will use a provider model for extensibility to support different types of stores & verifiers. It supports two types of providers.
 
-**Built-In/Internal providers** are available in the source of the framework and are registered during startup using the ```init``` function. Referrer store using [ORAS](https://github.com/oras-project/oras) and signature verification using [notaryv2](https://github.com/notaryproject/notation) will  be available as the built-in providers that are managed by the framework.
+**Built-In/Internal providers** are available in the source of the framework and are registered during startup using the ```init``` function. Referrer store using [ORAS](https://github.com/oras-project/oras) and signature verification using [notation](https://github.com/notaryproject/notation) will  be available as the built-in providers that are managed by the framework.
 
 **External/Plugin** providers are external to the source and process of the framework. These providers will be registered as binaries that the framework will locate in the configured paths and execute as per the corresponding plugin specification. The following section outlines the plugin architecture used for supporting external providers into the framework.
 
@@ -151,7 +151,7 @@ type ReferenceVerifier interface {
 - For a given artifact type, all verifiers that ```CanVerify```  will be invoked in the order that are registered in the configuration.
 - The verifier SHOULD return a result that contains all details of the verification for auditing purposes.
 - Every verifier should have access to the store  where the reference artifact is queried from. This store is used to fetch other metadata required for verification like manifest & blobs.
-- The framework MAY provide reference implementations for the interface as internal providers. For example notary v2 verifier that implements the verification of artifacts with type ```notary.v2.signature```. Similary there can be SBOM verifier that supports verification of SBOMs.
+- The framework MAY provide reference implementations for the interface as internal providers. For example notation verifier that implements the verification of artifacts with type ```notary.signature```. Similary there can be SBOM verifier that supports verification of SBOMs.
 
 ### Open Questions
 
@@ -209,7 +209,7 @@ There could be a tree of references that needs to be traversed and verified befo
 - Should executor or verifier responsible for nested verification?
 - Given the recursive nature of verifying the nested references, do we need to define an exit criteria to limit the nested levels?
 - How do we define the need for nested verification for a given artifact type? Will this be encompassed within the verifier settings or will it be a separate config?
-- Can nested verification be the default behavior for every artifact with an option to exclude this behavior for some artifacts? For example, all artifacts will perform nested verification except for the notary v2 signatures?
+- Can nested verification be the default behavior for every artifact with an option to exclude this behavior for some artifacts? For example, all artifacts will perform nested verification except for the notation signatures?
 
 ### Models of executor
 
@@ -229,7 +229,7 @@ In this model, every verifier that is registered with the framework is standalon
 *Cons*
 
 - This model will be good if registry supports artifact type filtering. If not, every verifier will query  all referrers and do the filtering on the client side which can be expensive (we have hard 3 second timeout for the admission controller in k8s)
-- How do we manage configuration without duplicating? For example, trust policy required to verify signatures of SBOM might be duplicated both under SBOM and notary verifier. If delegation model is used to support nested verification, then [model 2](#Model-2-Light-weight-verifiers) might be cleaner way to control the flow of verification.  
+- How do we manage configuration without duplicating? For example, trust policy required to verify signatures of SBOM might be duplicated both under SBOM and notation verifier. If delegation model is used to support nested verification, then [model 2](#Model-2-Light-weight-verifiers) might be cleaner way to control the flow of verification.  
 
 #### Model 2: Light weight verifiers
 
@@ -314,7 +314,7 @@ When an artifact has multiple signatures, teams can choose to ensure any one of
 ```yaml=
 policy:
     type: config
-    skipAfterFirstSuccess: ["org.cncf.notary.v2"]
+    skipAfterFirstSuccess: ["org.cncf.notary"]
 ```
 
 - OPA
@@ -326,14 +326,14 @@ policy:
         package ratify.rules
         
         verify_reference{
-            not input.reference.artifactType == "org.cncf.notary.v2"
+            not input.reference.artifactType == "org.cncf.notary"
         }
         
         verify_reference {
-           not notary_success
+           not notation_success
         }
         
-        notary_success{
+        notation_success{
             result := input.results[_]           
             result.artifactType ==  input.reference.artifactType
             result.isSuccess == "true"
@@ -390,7 +390,7 @@ Teams can choose to continue verification even if certain verifiers fails with c
 policy:
     type: config
     continueOnErrors:
-        - name : "notaryv2"
+        - name : "notation"
           errorCodes: ["CERT_EXPIRED"]
           matchingArtifacts: [*.azurecr.io]
 ```
@@ -416,7 +416,7 @@ policy:
         is_cert_expired {
             regex.match(".+.azurecr.io$", input.subject)
             result := input.results[_]
-            input.verifier.name == "notaryv2"
+            input.verifier.name == "notation"
             input.verifier.artifactTypes[_] == result.artifactType
             result.error.code == "CERT_EXPIRED"
         }
@@ -576,13 +576,13 @@ stores:
 verifiers:
   version: 1.0.0
   plugins:
-  - name: nv2verifier
-    artifactTypes: application/vnd.cncf.notary.v2
+  - name: notation
+    artifactTypes: application/vnd.cncf.notary.signature
     verificationCerts:
     - "/home/user/.notary/keys/wabbit-networks.crt"
   - name: sbom
     artifactTypes: application/x.example.sbom.v0
-    nestedReferences: application/vnd.cncf.notary.v2
+    nestedReferences: application/vnd.cncf.notary.signature
 executor:
   cache: false
 policy:
diff --git a/docs/reference/store.md b/docs/reference/store.md
index 8a4e261..68e37a8 100644
--- a/docs/reference/store.md
+++ b/docs/reference/store.md
@@ -204,13 +204,13 @@ stores:
 verifiers:
   version: 1.0.0
   plugins:
-  - name: nv2verifier
-    artifactTypes: application/vnd.cncf.notary.v2
+  - name: notation
+    artifactTypes: application/vnd.cncf.notary.signature
     verificationCerts:
     - "/home/user/.notary/keys/wabbit-networks.crt"
   - name: sbom
     artifactTypes: application/x.example.sbom.v0
-    nestedReferences: application/vnd.cncf.notary.v2
+    nestedReferences: application/vnd.cncf.notary.signature
 executor:
   cache: false
 policy:
@@ -223,13 +223,13 @@ policy:
         }
 ```
 
-2. An example subject ```registry.wabbit-networks.io:5000/net-monitor:signed@sha256:a0fc570a245b09ed752c42d600ee3bb5b4f77bbd70d8898780b7ab43454530eb``` will be used to query for its referrers of type ```application/vnd.cncf.notary.v2```.
+2. An example subject ```registry.wabbit-networks.io:5000/net-monitor:signed@sha256:a0fc570a245b09ed752c42d600ee3bb5b4f77bbd70d8898780b7ab43454530eb``` will be used to query for its referrers of type ```application/vnd.cncf.notary.signature```.
 3. The framework calls the plugin ```ociregistry``` with the following environment variables
 
 - **RATIFY_STORE_COMMAND** : ```LISTREFERRERS```
 - **RATIFY_STORE_SUBJECT**: ```registry.wabbit-networks.io:5000/net-monitor:signed@sha256:a0fc570a245b09ed752c42d600ee3bb5b4f77bbd70d8898780b7ab43454530eb```
 - **RATIFY_STORE_VERSION**: ```1.0.0```
-- **RATIFY_STORE_ARGS** : ```artifactTypes:application/vnd.cncf.notary.v2```
+- **RATIFY_STORE_ARGS** : ```artifactTypes:application/vnd.cncf.notary.signature```
 
 5. It calls the plugin with the following JSON execution configuration
 
@@ -251,7 +251,7 @@ policy:
           "mediaType": "application/vnd.cncf.oras.artifact.manifest.v1+json",
           "digest": "sha256:5b0bcabd1ed22e9fb1310cf6c2dec7cdef19f0ad69efa1f392e94a4333501270",
           "size": 7682,
-          "artifactType": "application/vnd.cncf.notary.v2"
+          "artifactType": "application/vnd.cncf.notary.signature"
         }
     ],
     "nextToken":""
diff --git a/docs/reference/verification-result-version.md b/docs/reference/verification-result-version.md
index f2023ab..2d3bb69 100644
--- a/docs/reference/verification-result-version.md
+++ b/docs/reference/verification-result-version.md
@@ -70,7 +70,7 @@ definitions:
         {
           "subject": "registry:5000/sbom@sha256:a59b9a5ee8ce41fed4be7f6b8d8619bd9e619bbda6b7b1feb591c3c85f6ab7af",
           "isSuccess": true,
-          "name": "notaryv2",
+          "name": "notation",
           "message": "signature verification success",
           "extensions": {
             "Issuer": "CN=ratify-bats-test,O=Notary,L=Seattle,ST=WA,C=US",
@@ -173,7 +173,7 @@ definitions:
             {
               "isSuccess": true,
               "message": "signature verification success",
-              "name": "notaryv2",
+              "name": "notation",
               "extensions": {
                 "Issuer": "CN=ratify-bats-test,O=Notary,L=Seattle,ST=WA,C=US",
                 "SN": "CN=ratify-bats-test,O=Notary,L=Seattle,ST=WA,C=US"
diff --git a/docs/reference/verifier.md b/docs/reference/verifier.md
index e8014b5..b69fb8c 100644
--- a/docs/reference/verifier.md
+++ b/docs/reference/verifier.md
@@ -67,13 +67,13 @@ Any other fields specified for a plugin other than the above mentioned are consi
 verifiers:
   version: 1.0.0
   plugins:
-  - name: nv2verifier
-    artifactTypes: application/vnd.cncf.notary.v2
+  - name: notation
+    artifactTypes: application/vnd.cncf.notary.signature
     verificationCerts:
     - "/home/user/.notary/keys/wabbit-networks.crt"
   - name: sbom
     artifactTypes: application/x.example.sbom.v0
-    nestedReferences: application/vnd.cncf.notary.v2
+    nestedReferences: application/vnd.cncf.notary.signature
 ```
 
 ### Section2 : Verifier Interface
@@ -184,13 +184,13 @@ stores:
 verifiers:
   version: 1.0.0
   plugins:
-  - name: nv2verifier
-    artifactTypes: application/vnd.cncf.notary.v2
+  - name: notation
+    artifactTypes: application/vnd.cncf.notary.signature
     verificationCerts:
     - "/home/user/.notary/keys/wabbit-networks.crt"
   - name: sbom
     artifactTypes: application/x.example.sbom.v0
-    nestedReferences: application/vnd.cncf.notary.v2
+    nestedReferences: application/vnd.cncf.notary.signature
 executor:
   cache: false
 policy:
@@ -210,12 +210,12 @@ policy:
   "mediaType": "application/vnd.cncf.oras.artifact.manifest.v1+json",
   "digest": "sha256:5b0bcabd1ed22e9fb1310cf6c2dec7cdef19f0ad69efa1f392e94a4333501270",
   "size": 7682,
-  "artifactType": "application/vnd.cncf.notary.v2"
+  "artifactType": "application/vnd.cncf.notary.signature"
 }
 ```
 
-3. The framework uses the ```artifactTypes``` property to match the verifier plugin for the above reference type. In this case, the verifier with the name ```nv2verifier``` supports its verification.
-4. The framework calls the plugin ```nv2verifier``` with the following environment variables
+3. The framework uses the ```artifactTypes``` property to match the verifier plugin for the above reference type. In this case, the verifier with the name ```notation``` supports its verification.
+4. The framework calls the plugin ```notation``` with the following environment variables
 
 - **RATIFY_VERIFIER_COMMAND** : ```VERIFY```
 - **RATIFY_VERIFIER_SUBJECT**: ```registry.wabbit-networks.io:5000/net-monitor:signed@sha256:a0fc570a245b09ed752c42d600ee3bb5b4f77bbd70d8898780b7ab43454530eb```
@@ -226,8 +226,8 @@ policy:
 ```json=
 {
 "config" : {
-    "name" : "nv2verifier",
-    "artifactTypes": "[application/vnd.cncf.notary.v2]",
+    "name" : "notation",
+    "artifactTypes": "[application/vnd.cncf.notary.signature]",
     "verificationCerts": ["/home/user/.notary/keys/wabbit-networks.crt"]    
 },
 "storeConfig": {
@@ -238,17 +238,17 @@ policy:
   "mediaType": "application/vnd.cncf.oras.artifact.manifest.v1+json",
   "digest": "sha256:5b0bcabd1ed22e9fb1310cf6c2dec7cdef19f0ad69efa1f392e94a4333501270",
   "size": 7682,
-  "artifactType": "application/vnd.cncf.notary.v2"
+  "artifactType": "application/vnd.cncf.notary.signature"
 }
 }
 ```
 
-6. The  ```nv2verifier``` verifies the artifact using the provided configuration and returns a following JSON result
+6. The  ```notation``` verifies the artifact using the provided configuration and returns a following JSON result
 
 ```json=
 {
       "isSuccess": true,
-      "name": "nv2verifier",
+      "name": "notation",
       "results": [
         "signature verification success"
       ]
@@ -256,12 +256,12 @@ policy:
 ```
 ### Section 6: Built in verifiers
 
-#### NotaryV2
-NotaryV2 is a built in verifier to Ratify. Notary v2 currently supports X.509 based PKI and identities, and uses a trust store and trust policy to determine if a signed artifact is considered authentic.
+#### Notation
+Notation is a built in verifier to Ratify. Notation currently supports X.509 based PKI and identities, and uses a trust store and trust policy to determine if a signed artifact is considered authentic.
 There are two ways to configure verification certificates:
 
 1. verificationCerts:  
-notary verifier will load all certificates from path specified in this array  
+notation verifier will load all certificates from path specified in this array  
 
 2. verificationCertStores:  
 
@@ -272,14 +272,14 @@ In the following example, the verifier's configuration references 4 `Certificate
 
 verificationCertStores property defines a collection of cert store objects. [Trust policy](https://github.com/notaryproject/notaryproject/blob/main/specs/trust-store-trust-policy.md) is a policy language that indicates which identities are trusted to produce artifacts. The following example shows a generic and permissive policy. Here, ca:certs is the only trust store specified and the certs suffix corresponds to the certs certification collection listed in the verificationCertStores section.   
 
-A sample notary verifier with verificationCertStores defined:
+A sample notation verifier with verificationCertStores defined:
 ```json=
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
     verificationCertStores:
diff --git a/library/notaryv2-issuer-validation/samples/constraint.yaml b/library/notation-issuer-validation/samples/constraint.yaml
similarity index 89%
rename from library/notaryv2-issuer-validation/samples/constraint.yaml
rename to library/notation-issuer-validation/samples/constraint.yaml
index fbfd36c..640178d 100644
--- a/library/notaryv2-issuer-validation/samples/constraint.yaml
+++ b/library/notation-issuer-validation/samples/constraint.yaml
@@ -1,5 +1,5 @@
 apiVersion: constraints.gatekeeper.sh/v1beta1
-kind: NotaryV2IssuerValidation
+kind: NotationIssuerValidation
 metadata:
   name: localhost-signature-validation
 spec:
diff --git a/library/notaryv2-issuer-validation/template.yaml b/library/notation-issuer-validation/template.yaml
similarity index 75%
rename from library/notaryv2-issuer-validation/template.yaml
rename to library/notation-issuer-validation/template.yaml
index a2fbbc7..ea8e0c3 100644
--- a/library/notaryv2-issuer-validation/template.yaml
+++ b/library/notation-issuer-validation/template.yaml
@@ -1,12 +1,12 @@
 apiVersion: templates.gatekeeper.sh/v1beta1
 kind: ConstraintTemplate
 metadata:
-  name: notaryv2issuervalidation
+  name: notationissuervalidation
 spec:
   crd:
     spec:
       names:
-        kind: NotaryV2IssuerValidation
+        kind: NotationIssuerValidation
       validation:
         openAPIV3Schema:
           type: object
@@ -16,7 +16,7 @@ spec:
   targets:
     - target: admission.k8s.gatekeeper.sh
       rego: |
-        package notaryv2issuervalidation
+        package notationissuervalidation
         
         # Get data from Ratify
         remote_data := response {
@@ -53,8 +53,8 @@ spec:
         general_violation[{"result": result}] {
           subject_results := remote_data.responses[_]
           subject_result := subject_results[1]
-          notaryv2_results := [res | subject_result.verifierReports[i].name == "notaryv2"; res := subject_result.verifierReports[i]]
-          issuer_results := [res | notaryv2_results[i].extensions.Issuer == input.parameters.issuer; res := notaryv2_results[i]]
+          notation_results := [res | subject_result.verifierReports[i].name == "notation"; res := subject_result.verifierReports[i]]
+          issuer_results := [res | notation_results[i].extensions.Issuer == input.parameters.issuer; res := notation_results[i]]
           count(issuer_results) == 0
           result := sprintf("Subject %s has no signatures for certificate with Issuer: %s", [subject_results[0], input.parameters.issuer])
         }
@@ -63,9 +63,9 @@ spec:
         general_violation[{"result": result}] {
           subject_results := remote_data.responses[_]
           subject_result := subject_results[1]
-          notaryv2_results := [res | subject_result.verifierReports[i].name == "notaryv2"; res := subject_result.verifierReports[i]]
-          notaryv2_result := notaryv2_results[_]
-          notaryv2_result.isSuccess == false
-          notaryv2_result.extensions.Issuer == input.parameters.issuer
-          result = sprintf("Subject %s failed signature validation: %s", [subject_results[0], notaryv2_result.message])
+          notation_results := [res | subject_result.verifierReports[i].name == "notation"; res := subject_result.verifierReports[i]]
+          notation_result := notation_results[_]
+          notation_result.isSuccess == false
+          notation_result.extensions.Issuer == input.parameters.issuer
+          result = sprintf("Subject %s failed signature validation: %s", [subject_results[0], notation_result.message])
         }
diff --git a/library/notation-validation/template.yml b/library/notation-validation/template.yml
index ef8fe83..4ca3d03 100644
--- a/library/notation-validation/template.yml
+++ b/library/notation-validation/template.yml
@@ -34,8 +34,8 @@ spec:
         general_violation[{"result": result}] {
           subject_results := remote_data.responses[_]
           subject_result := subject_results[1]
-          notaryv2_results := [res | subject_result.verifierReports[i].name == "notaryv2"; res := subject_result.verifierReports[i]]
-          successful_result := [ notaryv2_result | notaryv2_result := notaryv2_results[_]; notaryv2_result["isSuccess"] == true]
+          notation_results := [res | subject_result.verifierReports[i].name == "notation"; res := subject_result.verifierReports[i]]
+          successful_result := [ notation_result | notation_result := notation_results[_]; notation_result["isSuccess"] == true]
           successful_result == []
           result = sprintf("signature verification failed for all signatures associated with %s", [subject_results[0]])
         }
diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go
index d3f8c88..3b3f862 100644
--- a/pkg/manager/manager.go
+++ b/pkg/manager/manager.go
@@ -35,7 +35,7 @@ import (
 	_ "github.com/deislabs/ratify/pkg/policyprovider/regopolicy"   // register rego policy provider
 	_ "github.com/deislabs/ratify/pkg/referrerstore/oras"          // register ORAS referrer store
 	"github.com/deislabs/ratify/pkg/utils"
-	_ "github.com/deislabs/ratify/pkg/verifier/notaryv2" // register notaryv2 verifier
+	_ "github.com/deislabs/ratify/pkg/verifier/notation" // register notation verifier
 	"github.com/open-policy-agent/cert-controller/pkg/rotator"
 	"github.com/sirupsen/logrus"
 	_ "k8s.io/client-go/plugin/pkg/client/auth" // import additional authentication methods
diff --git a/pkg/utils/certificateUtils.go b/pkg/utils/certificateUtils.go
index 12d08c5..df0ed41 100644
--- a/pkg/utils/certificateUtils.go
+++ b/pkg/utils/certificateUtils.go
@@ -80,7 +80,7 @@ func GetCertificatesFromPath(path string) ([]*x509.Certificate, error) {
 		return nil, err
 	}
 
-	logrus.Infof("%v notary verification certificates loaded from path '%v'", len(certs), path)
+	logrus.Infof("%v notation verification certificates loaded from path '%v'", len(certs), path)
 	return certs, nil
 }
 
diff --git a/pkg/verifier/notaryv2/notaryv2.go b/pkg/verifier/notation/notation.go
similarity index 75%
rename from pkg/verifier/notaryv2/notaryv2.go
rename to pkg/verifier/notation/notation.go
index 74ba3c4..b8ba68c 100644
--- a/pkg/verifier/notaryv2/notaryv2.go
+++ b/pkg/verifier/notation/notation.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package notaryv2
+package notation
 
 import (
 	"context"
@@ -35,18 +35,18 @@ import (
 	_ "github.com/notaryproject/notation-core-go/signature/cose" // register COSE signature
 	_ "github.com/notaryproject/notation-core-go/signature/jws"  // register JWS signature
 	"github.com/notaryproject/notation-go"
-	notaryVerifier "github.com/notaryproject/notation-go/verifier"
+	notationVerifier "github.com/notaryproject/notation-go/verifier"
 	"github.com/notaryproject/notation-go/verifier/trustpolicy"
 	oci "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 const (
-	verifierName    = "notaryv2"
-	defaultCertPath = "ratify-certs/notary/truststore"
+	verifierName    = "notation"
+	defaultCertPath = "ratify-certs/notation/truststore"
 )
 
-// NotaryV2VerifierConfig describes the configuration of notation verifier
-type NotaryV2VerifierConfig struct { //nolint:revive // ignore linter to have unique type name
+// NotationPluginVerifierConfig describes the configuration of notation verifier
+type NotationPluginVerifierConfig struct { //nolint:revive // ignore linter to have unique type name
 	Name          string `json:"name"`
 	ArtifactTypes string `json:"artifactTypes"`
 
@@ -58,18 +58,18 @@ type NotaryV2VerifierConfig struct { //nolint:revive // ignore linter to have un
 	TrustPolicyDoc trustpolicy.Document `json:"trustPolicyDoc"`
 }
 
-type notaryV2Verifier struct {
+type notationPluginVerifier struct {
 	artifactTypes    []string
 	notationVerifier *notation.Verifier
 }
 
-type notaryv2VerifierFactory struct{}
+type notationPluginVerifierFactory struct{}
 
 func init() {
-	factory.Register(verifierName, &notaryv2VerifierFactory{})
+	factory.Register(verifierName, &notationPluginVerifierFactory{})
 }
 
-func (f *notaryv2VerifierFactory) Create(_ string, verifierConfig config.VerifierConfig, pluginDirectory string) (verifier.ReferenceVerifier, error) {
+func (f *notationPluginVerifierFactory) Create(_ string, verifierConfig config.VerifierConfig, pluginDirectory string) (verifier.ReferenceVerifier, error) {
 	conf, err := parseVerifierConfig(verifierConfig)
 	if err != nil {
 		return nil, err
@@ -81,17 +81,17 @@ func (f *notaryv2VerifierFactory) Create(_ string, verifierConfig config.Verifie
 	}
 
 	artifactTypes := strings.Split(conf.ArtifactTypes, ",")
-	return &notaryV2Verifier{
+	return &notationPluginVerifier{
 		artifactTypes:    artifactTypes,
 		notationVerifier: &verfiyService,
 	}, nil
 }
 
-func (v *notaryV2Verifier) Name() string {
+func (v *notationPluginVerifier) Name() string {
 	return verifierName
 }
 
-func (v *notaryV2Verifier) CanVerify(_ context.Context, referenceDescriptor ocispecs.ReferenceDescriptor) bool {
+func (v *notationPluginVerifier) CanVerify(_ context.Context, referenceDescriptor ocispecs.ReferenceDescriptor) bool {
 	for _, at := range v.artifactTypes {
 		if at == "*" || at == referenceDescriptor.ArtifactType {
 			return true
@@ -100,7 +100,7 @@ func (v *notaryV2Verifier) CanVerify(_ context.Context, referenceDescriptor ocis
 	return false
 }
 
-func (v *notaryV2Verifier) Verify(ctx context.Context,
+func (v *notationPluginVerifier) Verify(ctx context.Context,
 	subjectReference common.Reference,
 	referenceDescriptor ocispecs.ReferenceDescriptor,
 	store referrerstore.ReferrerStore) (verifier.VerifierResult, error) {
@@ -126,7 +126,7 @@ func (v *notaryV2Verifier) Verify(ctx context.Context,
 			return verifier.VerifierResult{IsSuccess: false}, fmt.Errorf("failed to get blob content of digest: %s, err: %w", blobDesc.Digest, err)
 		}
 
-		// TODO: notary verify API only accepts digested reference now.
+		// TODO: notation verify API only accepts digested reference now.
 		// Pass in tagged reference instead once notation-go supports it.
 		subjectRef := fmt.Sprintf("%s@%s", subjectReference.Path, subjectReference.Digest.String())
 		outcome, err := v.verifySignature(ctx, subjectRef, blobDesc.MediaType, subjectDesc.Descriptor, refBlob)
@@ -134,7 +134,7 @@ func (v *notaryV2Verifier) Verify(ctx context.Context,
 			return verifier.VerifierResult{IsSuccess: false, Extensions: extensions}, fmt.Errorf("failed to verify signature, err: %w", err)
 		}
 
-		// Note: notary verifier already validates certificate chain is not empty.
+		// Note: notation verifier already validates certificate chain is not empty.
 		cert := outcome.EnvelopeContent.SignerInfo.CertificateChain[0]
 		extensions["Issuer"] = cert.Issuer.String()
 		extensions["SN"] = cert.Subject.String()
@@ -148,16 +148,16 @@ func (v *notaryV2Verifier) Verify(ctx context.Context,
 	}, nil
 }
 
-func getVerifierService(conf *NotaryV2VerifierConfig, pluginDirectory string) (notation.Verifier, error) {
+func getVerifierService(conf *NotationPluginVerifierConfig, pluginDirectory string) (notation.Verifier, error) {
 	store := &trustStore{
 		certPaths:  conf.VerificationCerts,
 		certStores: conf.VerificationCertStores,
 	}
 
-	return notaryVerifier.New(&conf.TrustPolicyDoc, store, NewRatifyPluginManager(pluginDirectory))
+	return notationVerifier.New(&conf.TrustPolicyDoc, store, NewRatifyPluginManager(pluginDirectory))
 }
 
-func (v *notaryV2Verifier) verifySignature(ctx context.Context, subjectRef, mediaType string, subjectDesc oci.Descriptor, refBlob []byte) (*notation.VerificationOutcome, error) {
+func (v *notationPluginVerifier) verifySignature(ctx context.Context, subjectRef, mediaType string, subjectDesc oci.Descriptor, refBlob []byte) (*notation.VerificationOutcome, error) {
 	opts := notation.VerifierVerifyOptions{
 		SignatureMediaType: mediaType,
 		ArtifactReference:  subjectRef,
@@ -166,8 +166,8 @@ func (v *notaryV2Verifier) verifySignature(ctx context.Context, subjectRef, medi
 	return (*v.notationVerifier).Verify(ctx, subjectDesc, refBlob, opts)
 }
 
-func parseVerifierConfig(verifierConfig config.VerifierConfig) (*NotaryV2VerifierConfig, error) {
-	conf := &NotaryV2VerifierConfig{}
+func parseVerifierConfig(verifierConfig config.VerifierConfig) (*NotationPluginVerifierConfig, error) {
+	conf := &NotationPluginVerifierConfig{}
 
 	verifierConfigBytes, err := json.Marshal(verifierConfig)
 	if err != nil {
@@ -175,7 +175,7 @@ func parseVerifierConfig(verifierConfig config.VerifierConfig) (*NotaryV2Verifie
 	}
 
 	if err := json.Unmarshal(verifierConfigBytes, &conf); err != nil {
-		return nil, fmt.Errorf("failed to unmarshal to notaryV2VerifierConfig from： %+v, err: %w", verifierConfig, err)
+		return nil, fmt.Errorf("failed to unmarshal to notationPluginVerifierConfig from： %+v, err: %w", verifierConfig, err)
 	}
 
 	defaultCertsDir := paths.Join(homedir.Get(), ratifyconfig.ConfigFileDir, defaultCertPath)
@@ -184,6 +184,6 @@ func parseVerifierConfig(verifierConfig config.VerifierConfig) (*NotaryV2Verifie
 }
 
 // signatures should not have nested references
-func (v *notaryV2Verifier) GetNestedReferences() []string {
+func (v *notationPluginVerifier) GetNestedReferences() []string {
 	return []string{}
 }
diff --git a/pkg/verifier/notaryv2/pluginmanager.go b/pkg/verifier/notation/pluginmanager.go
similarity index 99%
rename from pkg/verifier/notaryv2/pluginmanager.go
rename to pkg/verifier/notation/pluginmanager.go
index 879351b..20cf097 100644
--- a/pkg/verifier/notaryv2/pluginmanager.go
+++ b/pkg/verifier/notation/pluginmanager.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package notaryv2
+package notation
 
 import (
 	"context"
diff --git a/pkg/verifier/notaryv2/truststore.go b/pkg/verifier/notation/truststore.go
similarity index 99%
rename from pkg/verifier/notaryv2/truststore.go
rename to pkg/verifier/notation/truststore.go
index 017774b..3fb91e5 100644
--- a/pkg/verifier/notaryv2/truststore.go
+++ b/pkg/verifier/notation/truststore.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package notaryv2
+package notation
 
 import (
 	"context"


Test patch:
diff --git a/pkg/controllers/verifier_controller_test.go b/pkg/controllers/verifier_controller_test.go
index dfffb0f..27086cc 100644
--- a/pkg/controllers/verifier_controller_test.go
+++ b/pkg/controllers/verifier_controller_test.go
@@ -34,10 +34,10 @@ func TestMain(m *testing.M) {
 func TestVerifierAdd_EmptyParameter(t *testing.T) {
 	resetVerifierMap()
 	var testVerifierSpec = configv1beta1.VerifierSpec{
-		Name:          "notaryv2",
+		Name:          "notation",
 		ArtifactTypes: "application/vnd.cncf.notary.signature",
 	}
-	var resource = "notaryv2"
+	var resource = "notation"
 
 	if err := verifierAddOrReplace(testVerifierSpec, resource); err != nil {
 		t.Fatalf("verifierAddOrReplace() expected no error, actual %v", err)
diff --git a/pkg/policyprovider/configpolicy/configpolicy_test.go b/pkg/policyprovider/configpolicy/configpolicy_test.go
index 59bc37c..e6e66bf 100644
--- a/pkg/policyprovider/configpolicy/configpolicy_test.go
+++ b/pkg/policyprovider/configpolicy/configpolicy_test.go
@@ -33,9 +33,9 @@ func TestPolicyEnforcer_ContinueVerifyOnFailure(t *testing.T) {
 	configPolicyConfig := map[string]interface{}{
 		"name": "configPolicy",
 		"artifactVerificationPolicies": map[string]types.ArtifactTypeVerifyPolicy{
-			"application/vnd.cncf.notary.v2": "any",
-			"org.example.sbom.v0":            "all",
-			"default":                        "any",
+			"application/vnd.cncf.notary.signature": "any",
+			"org.example.sbom.v0":                   "all",
+			"default":                               "any",
 		},
 	}
 	config := pc.PoliciesConfig{
@@ -58,7 +58,7 @@ func TestPolicyEnforcer_ContinueVerifyOnFailure(t *testing.T) {
 	}
 	referenceDesc := ocispecs.ReferenceDescriptor{
 		Descriptor:   oci.Descriptor{},
-		ArtifactType: "application/vnd.cncf.notary.v2",
+		ArtifactType: "application/vnd.cncf.notary.signature",
 	}
 	result := vt.VerifyResult{
 		IsSuccess:       false,
@@ -113,7 +113,7 @@ func TestPolicyEnforcer_OverallVerifyResult(t *testing.T) {
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    false,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 			},
 			output: false,
@@ -128,12 +128,12 @@ func TestPolicyEnforcer_OverallVerifyResult(t *testing.T) {
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    true,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    false,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 			},
 			output: false,
@@ -150,107 +150,107 @@ func TestPolicyEnforcer_OverallVerifyResult(t *testing.T) {
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    true,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    false,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 			},
 			output: true,
 		},
 		{
-			// any notary artifact policy but no artifact verifier reports
+			// any notation artifact policy but no artifact verifier reports
 			configPolicyConfig: map[string]interface{}{
 				"name": "configPolicy",
 				"artifactVerificationPolicies": map[string]types.ArtifactTypeVerifyPolicy{
-					"application/vnd.cncf.notary.v2": "any",
+					"application/vnd.cncf.notary.signature": "any",
 				},
 			},
 			verifierReports: []interface{}{},
 			output:          false,
 		},
 		{
-			// any notary artifact policy and only 1 notary report is true
+			// any notation artifact policy and only 1 notation report is true
 			configPolicyConfig: map[string]interface{}{
 				"name": "configPolicy",
 				"artifactVerificationPolicies": map[string]types.ArtifactTypeVerifyPolicy{
-					"application/vnd.cncf.notary.v2": "any",
+					"application/vnd.cncf.notary.signature": "any",
 				},
 			},
 			verifierReports: []interface{}{
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    true,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    false,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 			},
 			output: true,
 		},
 		{
-			// all notary artifact policy but only 1 notary report is true
+			// all notation artifact policy but only 1 notation report is true
 			configPolicyConfig: map[string]interface{}{
 				"name": "configPolicy",
 				"artifactVerificationPolicies": map[string]types.ArtifactTypeVerifyPolicy{
-					"application/vnd.cncf.notary.v2": "all",
+					"application/vnd.cncf.notary.signature": "all",
 				},
 			},
 			verifierReports: []interface{}{
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    true,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    false,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 			},
 			output: false,
 		},
 		{
-			// all notary artifact policy and both notary reports are true
+			// all notation artifact policy and both notation reports are true
 			configPolicyConfig: map[string]interface{}{
 				"name": "configPolicy",
 				"artifactVerificationPolicies": map[string]types.ArtifactTypeVerifyPolicy{
-					"application/vnd.cncf.notary.v2": "all",
+					"application/vnd.cncf.notary.signature": "all",
 				},
 			},
 			verifierReports: []interface{}{
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    true,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    true,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 			},
 			output: true,
 		},
 		{
-			// any notary artifact policy, any sbom artifact policy and notary report is true and sbom is false
+			// any notation artifact policy, any sbom artifact policy and notation report is true and sbom is false
 			configPolicyConfig: map[string]interface{}{
 				"name": "configPolicy",
 				"artifactVerificationPolicies": map[string]types.ArtifactTypeVerifyPolicy{
-					"application/vnd.cncf.notary.v2": "any",
-					"org.example.sbom.v0":            "any",
+					"application/vnd.cncf.notary.signature": "any",
+					"org.example.sbom.v0":                   "any",
 				},
 			},
 			verifierReports: []interface{}{
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    true,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 				vr.VerifierResult{
 					Subject:      "",
@@ -261,19 +261,19 @@ func TestPolicyEnforcer_OverallVerifyResult(t *testing.T) {
 			output: false,
 		},
 		{
-			// any notary artifact policy, all sbom artifact policy, and both notary and sbom are true
+			// any notation artifact policy, all sbom artifact policy, and both notation and sbom are true
 			configPolicyConfig: map[string]interface{}{
 				"name": "configPolicy",
 				"artifactVerificationPolicies": map[string]types.ArtifactTypeVerifyPolicy{
-					"application/vnd.cncf.notary.v2": "any",
-					"org.example.sbom.v0":            "all",
+					"application/vnd.cncf.notary.signature": "any",
+					"org.example.sbom.v0":                   "all",
 				},
 			},
 			verifierReports: []interface{}{
 				vr.VerifierResult{
 					Subject:      "",
 					IsSuccess:    true,
-					ArtifactType: "application/vnd.cncf.notary.v2",
+					ArtifactType: "application/vnd.cncf.notary.signature",
 				},
 				vr.VerifierResult{
 					Subject:      "",
diff --git a/pkg/referrerstore/oras/oras_test.go b/pkg/referrerstore/oras/oras_test.go
index 71e9a19..b561e50 100644
--- a/pkg/referrerstore/oras/oras_test.go
+++ b/pkg/referrerstore/oras/oras_test.go
@@ -97,7 +97,7 @@ func TestORASListReferrers_SubjectDesc(t *testing.T) {
 		ReferrersList: []oci.Descriptor{
 			{
 				Digest:       referrerDigest,
-				ArtifactType: "application/vnd.cncf.notary.v2",
+				ArtifactType: "application/vnd.cncf.notary.signature",
 			},
 		},
 	}
@@ -125,8 +125,8 @@ func TestORASListReferrers_SubjectDesc(t *testing.T) {
 		t.Fatalf("expected digest %s, got %s", referrerDigest, referrers.Referrers[0].Digest)
 	}
 
-	if referrers.Referrers[0].ArtifactType != "application/vnd.cncf.notary.v2" {
-		t.Fatalf("expected artifact type %s, got %s", "application/vnd.cncf.notary.v2", referrers.Referrers[0].ArtifactType)
+	if referrers.Referrers[0].ArtifactType != "application/vnd.cncf.notary.signature" {
+		t.Fatalf("expected artifact type %s, got %s", "application/vnd.cncf.notary.signature", referrers.Referrers[0].ArtifactType)
 	}
 }
 
@@ -154,7 +154,7 @@ func TestORASListReferrers_NoSubjectDesc(t *testing.T) {
 		ReferrersList: []oci.Descriptor{
 			{
 				Digest:       referrerDigest,
-				ArtifactType: "application/vnd.cncf.notary.v2",
+				ArtifactType: "application/vnd.cncf.notary.signature",
 			},
 		},
 	}
@@ -182,8 +182,8 @@ func TestORASListReferrers_NoSubjectDesc(t *testing.T) {
 		t.Fatalf("expected digest %s, got %s", referrerDigest, referrers.Referrers[0].Digest)
 	}
 
-	if referrers.Referrers[0].ArtifactType != "application/vnd.cncf.notary.v2" {
-		t.Fatalf("expected artifact type %s, got %s", "application/vnd.cncf.notary.v2", referrers.Referrers[0].ArtifactType)
+	if referrers.Referrers[0].ArtifactType != "application/vnd.cncf.notary.signature" {
+		t.Fatalf("expected artifact type %s, got %s", "application/vnd.cncf.notary.signature", referrers.Referrers[0].ArtifactType)
 	}
 }
 
diff --git a/pkg/verifier/notaryv2/notaryv2_test.go b/pkg/verifier/notation/notation_test.go
similarity index 88%
rename from pkg/verifier/notaryv2/notaryv2_test.go
rename to pkg/verifier/notation/notation_test.go
index cd517b1..cf7afec 100644
--- a/pkg/verifier/notaryv2/notaryv2_test.go
+++ b/pkg/verifier/notation/notation_test.go
@@ -1,4 +1,4 @@
-package notaryv2
+package notation
 
 import (
 	"context"
@@ -59,8 +59,8 @@ var (
 	invalidRef = common.Reference{
 		Original: "invalid",
 	}
-	testNotaryVerifier notation.Verifier = mockNotaryVerifier{}
-	validBlobDesc                        = ocispec.Descriptor{
+	testNotationPluginVerifier notation.Verifier = mockNotationPluginVerifier{}
+	validBlobDesc                                = ocispec.Descriptor{
 		Digest: testDigest,
 	}
 	validBlobDesc2 = ocispec.Descriptor{
@@ -83,9 +83,9 @@ var (
 	}
 )
 
-type mockNotaryVerifier struct{}
+type mockNotationPluginVerifier struct{}
 
-func (v mockNotaryVerifier) Verify(_ context.Context, _ ocispec.Descriptor, signature []byte, _ notation.VerifierVerifyOptions) (*notation.VerificationOutcome, error) {
+func (v mockNotationPluginVerifier) Verify(_ context.Context, _ ocispec.Descriptor, signature []byte, _ notation.VerifierVerifyOptions) (*notation.VerificationOutcome, error) {
 	if reflect.DeepEqual(signature, testRefBlob2) {
 		return nil, fmt.Errorf("failed verification")
 	}
@@ -130,11 +130,11 @@ func (s mockStore) GetSubjectDescriptor(_ context.Context, _ common.Reference) (
 }
 
 func TestName(t *testing.T) {
-	v := &notaryV2Verifier{}
+	v := &notationPluginVerifier{}
 	name := v.Name()
 
-	if name != "notaryv2" {
-		t.Fatalf("expect name: notaryv2, got: %s", name)
+	if name != "notation" {
+		t.Fatalf("expect name: notation, got: %s", name)
 	}
 }
 
@@ -167,7 +167,7 @@ func TestCanVerify(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			v := &notaryV2Verifier{
+			v := &notationPluginVerifier{
 				artifactTypes: tt.artifactTypes,
 			}
 			desc := ocispecs.ReferenceDescriptor{
@@ -187,10 +187,10 @@ func TestParseVerifierConfig(t *testing.T) {
 		name      string
 		configMap map[string]interface{}
 		expectErr bool
-		expect    *NotaryV2VerifierConfig
+		expect    *NotationPluginVerifierConfig
 	}{
 		{
-			name: "failed unmarshalling to notary config",
+			name: "failed unmarshalling to notation config",
 			configMap: map[string]interface{}{
 				"name": []string{test},
 			},
@@ -203,7 +203,7 @@ func TestParseVerifierConfig(t *testing.T) {
 				"name": test,
 			},
 			expectErr: false,
-			expect: &NotaryV2VerifierConfig{
+			expect: &NotationPluginVerifierConfig{
 				Name:              test,
 				VerificationCerts: []string{defaultCertDir},
 			},
@@ -215,7 +215,7 @@ func TestParseVerifierConfig(t *testing.T) {
 				"verificationCerts": []string{testPath},
 			},
 			expectErr: false,
-			expect: &NotaryV2VerifierConfig{
+			expect: &NotationPluginVerifierConfig{
 				Name:              test,
 				VerificationCerts: []string{testPath, defaultCertDir},
 			},
@@ -231,7 +231,7 @@ func TestParseVerifierConfig(t *testing.T) {
 				},
 			},
 			expectErr: false,
-			expect: &NotaryV2VerifierConfig{
+			expect: &NotationPluginVerifierConfig{
 				Name:              test,
 				VerificationCerts: []string{testPath, defaultCertDir},
 				VerificationCertStores: map[string][]string{
@@ -245,21 +245,21 @@ func TestParseVerifierConfig(t *testing.T) {
 	//TODO add new test for parseVerifierConfig
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			notaryConfig, err := parseVerifierConfig(tt.configMap)
+			notationPluginConfig, err := parseVerifierConfig(tt.configMap)
 
 			if (err != nil) != tt.expectErr {
 				t.Errorf("error = %v, expectErr = %v", err, tt.expectErr)
 			}
-			if !reflect.DeepEqual(notaryConfig, tt.expect) {
-				t.Errorf("expect %+v, got %+v", tt.expect, notaryConfig)
+			if !reflect.DeepEqual(notationPluginConfig, tt.expect) {
+				t.Errorf("expect %+v, got %+v", tt.expect, notationPluginConfig)
 			}
 		})
 	}
 }
 
 func TestVerifySignature(t *testing.T) {
-	v := &notaryV2Verifier{
-		notationVerifier: &testNotaryVerifier,
+	v := &notationPluginVerifier{
+		notationVerifier: &testNotationPluginVerifier,
 	}
 
 	outcome, err := v.verifySignature(context.Background(), testArtifactType1, testMediaType, testDesc1, testRefBlob)
@@ -305,7 +305,7 @@ func TestCreate(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			f := &notaryv2VerifierFactory{}
+			f := &notationPluginVerifierFactory{}
 			_, err := f.Create(testVersion, tt.configMap, "")
 
 			if (err != nil) != tt.expectErr {
@@ -356,8 +356,8 @@ func TestVerify(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			v := &notaryV2Verifier{
-				notationVerifier: &testNotaryVerifier,
+			v := &notationPluginVerifier{
+				notationVerifier: &testNotationPluginVerifier,
 			}
 
 			store := &mockStore{
@@ -378,7 +378,7 @@ func TestVerify(t *testing.T) {
 }
 
 func TestGetNestedReferences(t *testing.T) {
-	verifier := &notaryV2Verifier{}
+	verifier := &notationPluginVerifier{}
 	nestedReferences := verifier.GetNestedReferences()
 
 	if len(nestedReferences) != 0 {
diff --git a/pkg/verifier/notaryv2/pluginmanager_test.go b/pkg/verifier/notation/pluginmanager_test.go
similarity index 98%
rename from pkg/verifier/notaryv2/pluginmanager_test.go
rename to pkg/verifier/notation/pluginmanager_test.go
index 43b6f06..f82e3ae 100644
--- a/pkg/verifier/notaryv2/pluginmanager_test.go
+++ b/pkg/verifier/notation/pluginmanager_test.go
@@ -1,4 +1,4 @@
-package notaryv2
+package notation
 
 import (
 	"context"
diff --git a/pkg/verifier/notaryv2/truststore_test.go b/pkg/verifier/notation/truststore_test.go
similarity index 99%
rename from pkg/verifier/notaryv2/truststore_test.go
rename to pkg/verifier/notation/truststore_test.go
index 5d4b894..fad9d95 100644
--- a/pkg/verifier/notaryv2/truststore_test.go
+++ b/pkg/verifier/notation/truststore_test.go
@@ -1,4 +1,4 @@
-package notaryv2
+package notation
 
 import (
 	"crypto/x509"
diff --git a/scripts/azure-ci-test.sh b/scripts/azure-ci-test.sh
index b75b1d3..d414149 100755
--- a/scripts/azure-ci-test.sh
+++ b/scripts/azure-ci-test.sh
@@ -32,7 +32,7 @@ GATEKEEPER_VERSION=${2:-3.11.0}
 TENANT_ID=$3
 export RATIFY_NAMESPACE=${4:-gatekeeper-system}
 CERT_DIR=${5:-"~/ratify/certs"}
-export NOTARY_PEM_NAME="notary"
+export NOTATION_PEM_NAME="notation"
 TAG="test${SUFFIX}"
 REGISTRY="${ACR_NAME}.azurecr.io"
 
@@ -71,7 +71,7 @@ deploy_ratify() {
     --set gatekeeper.version=${GATEKEEPER_VERSION} \
     --set akvCertConfig.enabled=true \
     --set akvCertConfig.vaultURI=${VAULT_URI} \
-    --set akvCertConfig.cert1Name=${NOTARY_PEM_NAME} \
+    --set akvCertConfig.cert1Name=${NOTATION_PEM_NAME} \
     --set akvCertConfig.tenantId=${TENANT_ID} \
     --set oras.authProviders.azureWorkloadIdentityEnabled=true \
     --set azureWorkloadIdentity.clientId=${IDENTITY_CLIENT_ID} \
@@ -85,14 +85,14 @@ deploy_ratify() {
 }
 
 upload_cert_to_akv() {
-  rm -f notary.pem
-  cat ~/.config/notation/localkeys/ratify-bats-test.key >>notary.pem
-  cat ~/.config/notation/localkeys/ratify-bats-test.crt >>notary.pem
+  rm -f notation.pem
+  cat ~/.config/notation/localkeys/ratify-bats-test.key >>notation.pem
+  cat ~/.config/notation/localkeys/ratify-bats-test.crt >>notation.pem
 
   az keyvault certificate import \
     --vault-name ${KEYVAULT_NAME} \
-    -n ${NOTARY_PEM_NAME} \
-    -f notary.pem
+    -n ${NOTATION_PEM_NAME} \
+    -f notation.pem
 }
 
 save_logs() {
diff --git a/test/bats/azure-test.bats b/test/bats/azure-test.bats
index fb6c555..d2f07fd 100644
--- a/test/bats/azure-test.bats
+++ b/test/bats/azure-test.bats
@@ -36,8 +36,8 @@ SLEEP_TIME=1
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod demo-leaf --namespace default --force --ignore-not-found=true'
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod demo-leaf2 --namespace default --force --ignore-not-found=true'
 
-        # restore the original notary verifier for other tests
-        wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl apply -f ./test/bats/tests/config/config_v1beta1_verifier_notary_akv.yaml'
+        # restore the original notation verifier for other tests
+        wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl apply -f ./test/bats/tests/config/config_v1beta1_verifier_notation_akv.yaml'
     }
 
     # configure the default template/constraint
@@ -52,8 +52,8 @@ SLEEP_TIME=1
     assert_success
     sed -i '9,$d' ./test/bats/tests/config/config_v1beta1_certstore_inline.yaml
 
-    # configure the notary verifier to use the inline certificate store
-    run kubectl apply -f ./test/bats/tests/config/config_v1beta1_verifier_notary.yaml
+    # configure the notation verifier to use the inline certificate store
+    run kubectl apply -f ./test/bats/tests/config/config_v1beta1_verifier_notation.yaml
     assert_success
 
     # verify that the image can be run with a root cert
@@ -73,7 +73,7 @@ SLEEP_TIME=1
     assert_failure
 }
 
-@test "notary test" {
+@test "notation test" {
     teardown() {
         echo "cleaning up"
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod demo --namespace default --force --ignore-not-found=true'
@@ -232,18 +232,18 @@ SLEEP_TIME=1
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod crdtest --namespace default --force --ignore-not-found=true'
     }
 
-    echo "adding license checker, delete notary verifier and validate deployment fails due to missing notary verifier"
+    echo "adding license checker, delete notation verifier and validate deployment fails due to missing notation verifier"
     run kubectl apply -f ./config/samples/config_v1beta1_verifier_complete_licensechecker.yaml
     assert_success
-    run kubectl delete verifiers.config.ratify.deislabs.io/verifier-notary
+    run kubectl delete verifiers.config.ratify.deislabs.io/verifier-notation
     assert_success
     # wait for the httpserver cache to be invalidated
     sleep 15
     run kubectl run crdtest --namespace default --image=${TEST_REGISTRY}/notation:signed
     assert_failure
 
-    echo "Add notary verifier and validate deployment succeeds"
-    run kubectl apply -f ./config/samples/config_v1beta1_verifier_notary_certstore.yaml
+    echo "Add notation verifier and validate deployment succeeds"
+    run kubectl apply -f ./config/samples/config_v1beta1_verifier_notation_certstore.yaml
     assert_success
 
     # wait for the httpserver cache to be invalidated
diff --git a/test/bats/base-test.bats b/test/bats/base-test.bats
index a85ecd8..142e521 100644
--- a/test/bats/base-test.bats
+++ b/test/bats/base-test.bats
@@ -19,7 +19,7 @@ SLEEP_TIME=1
     assert_success
     sleep 5
     # validate certificate store status property shows success
-    run bash -c "kubectl get certificatestores.config.ratify.deislabs.io/ratify-notary-inline-cert -n gatekeeper-system -o yaml | grep 'issuccess: true'"
+    run bash -c "kubectl get certificatestores.config.ratify.deislabs.io/ratify-notation-inline-cert -n gatekeeper-system -o yaml | grep 'issuccess: true'"
     assert_success
     run kubectl run demo --namespace default --image=registry:5000/notation:signed
     assert_success
@@ -29,11 +29,11 @@ SLEEP_TIME=1
 }
 
 @test "crd version test" {
-    run kubectl delete verifiers.config.ratify.deislabs.io/verifier-notary
+    run kubectl delete verifiers.config.ratify.deislabs.io/verifier-notation
     assert_success
-    run kubectl apply -f ./config/samples/config_v1alpha1_verifier_notary.yaml
+    run kubectl apply -f ./config/samples/config_v1alpha1_verifier_notation.yaml
     assert_success
-    run bash -c "kubectl get verifiers.config.ratify.deislabs.io/verifier-notary -o yaml | grep 'apiVersion: config.ratify.deislabs.io/v1beta1'"
+    run bash -c "kubectl get verifiers.config.ratify.deislabs.io/verifier-notation -o yaml | grep 'apiVersion: config.ratify.deislabs.io/v1beta1'"
     assert_success
 
     run kubectl delete stores.config.ratify.deislabs.io/store-oras
@@ -44,7 +44,7 @@ SLEEP_TIME=1
     assert_success
 }
 
-@test "notary test" {
+@test "notation test" {
     teardown() {
         echo "cleaning up"
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod demo --namespace default --force --ignore-not-found=true'
@@ -57,7 +57,7 @@ SLEEP_TIME=1
     assert_success
     sleep 5
     # validate certificate store status property shows success
-    run bash -c "kubectl get certificatestores.config.ratify.deislabs.io/ratify-notary-inline-cert -n gatekeeper-system -o yaml | grep 'issuccess: true'"
+    run bash -c "kubectl get certificatestores.config.ratify.deislabs.io/ratify-notation-inline-cert -n gatekeeper-system -o yaml | grep 'issuccess: true'"
     assert_success
     run kubectl run demo --namespace default --image=registry:5000/notation:signed
     assert_success
@@ -72,18 +72,18 @@ SLEEP_TIME=1
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod crdtest --namespace default --force --ignore-not-found=true'
     }
 
-    echo "adding license checker, delete notary verifier and validate deployment fails due to missing notary verifier"
+    echo "adding license checker, delete notation verifier and validate deployment fails due to missing notation verifier"
     run kubectl apply -f ./config/samples/config_v1beta1_verifier_complete_licensechecker.yaml
     assert_success
-    run kubectl delete verifiers.config.ratify.deislabs.io/verifier-notary
+    run kubectl delete verifiers.config.ratify.deislabs.io/verifier-notation
     assert_success
     # wait for the httpserver cache to be invalidated
     sleep 15
     run kubectl run crdtest --namespace default --image=registry:5000/notation:signed
     assert_failure
 
-    echo "Add notary verifier and validate deployment succeeds"
-    run kubectl apply -f ./config/samples/config_v1beta1_verifier_notary.yaml
+    echo "Add notation verifier and validate deployment succeeds"
+    run kubectl apply -f ./config/samples/config_v1beta1_verifier_notation.yaml
     assert_success
 
     # wait for the httpserver cache to be invalidated
@@ -142,8 +142,8 @@ SLEEP_TIME=1
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete certificatestores.config.ratify.deislabs.io/certstore-inline --namespace default --ignore-not-found=true'
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod demo-alternate --namespace default --force --ignore-not-found=true'
 
-        # restore the original notary verifier for other tests
-        wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl apply -f ./config/samples/config_v1beta1_verifier_notary.yaml'
+        # restore the original notation verifier for other tests
+        wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl apply -f ./config/samples/config_v1beta1_verifier_notation.yaml'
     }
 
     # configure the default template/constraint
@@ -162,8 +162,8 @@ SLEEP_TIME=1
     assert_success
     sed -i '9,$d' ./test/bats/tests/config/config_v1beta1_certstore_inline.yaml
 
-    # configure the notary verifier to use the inline certificate store
-    run kubectl apply -f ./test/bats/tests/config/config_v1beta1_verifier_notary.yaml
+    # configure the notation verifier to use the inline certificate store
+    run kubectl apply -f ./test/bats/tests/config/config_v1beta1_verifier_notation.yaml
     assert_success
     sleep 10
 
@@ -202,8 +202,8 @@ SLEEP_TIME=1
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod demo-leaf --namespace default --force --ignore-not-found=true'
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod demo-leaf2 --namespace default --force --ignore-not-found=true'
 
-        # restore the original notary verifier for other tests
-        wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl apply -f ./config/samples/config_v1beta1_verifier_notary.yaml'
+        # restore the original notation verifier for other tests
+        wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl apply -f ./config/samples/config_v1beta1_verifier_notation.yaml'
     }
 
     # configure the default template/constraint
@@ -218,8 +218,8 @@ SLEEP_TIME=1
     assert_success
     sed -i '9,$d' ./test/bats/tests/config/config_v1beta1_certstore_inline.yaml
 
-    # configure the notary verifier to use the inline certificate store
-    run kubectl apply -f ./test/bats/tests/config/config_v1beta1_verifier_notary.yaml
+    # configure the notation verifier to use the inline certificate store
+    run kubectl apply -f ./test/bats/tests/config/config_v1beta1_verifier_notation.yaml
     assert_success
 
     # verify that the image can be run with a root cert
diff --git a/test/bats/cli-test.bats b/test/bats/cli-test.bats
index 03465e8..fdfc47b 100644
--- a/test/bats/cli-test.bats
+++ b/test/bats/cli-test.bats
@@ -2,7 +2,7 @@
 
 load helpers
 
-@test "notary verifier test" {
+@test "notation verifier test" {
     run bin/ratify verify -c $RATIFY_DIR/config.json -s $TEST_REGISTRY/notation:signed
     assert_cmd_verify_success
 
diff --git a/test/bats/high-availability.bats b/test/bats/high-availability.bats
index a82ebaa..41d30f2 100644
--- a/test/bats/high-availability.bats
+++ b/test/bats/high-availability.bats
@@ -6,7 +6,7 @@ BATS_TESTS_DIR=${BATS_TESTS_DIR:-test/bats/tests}
 WAIT_TIME=60
 SLEEP_TIME=1
 
-@test "notary test" {
+@test "notation test" {
     teardown() {
         echo "cleaning up"
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod demo --namespace default --force --ignore-not-found=true'
@@ -19,7 +19,7 @@ SLEEP_TIME=1
     assert_success
     sleep 5
     # validate certificate store status property shows success
-    run bash -c "kubectl get certificatestores.config.ratify.deislabs.io/ratify-notary-inline-cert -n gatekeeper-system -o yaml | grep 'issuccess: true'"
+    run bash -c "kubectl get certificatestores.config.ratify.deislabs.io/ratify-notation-inline-cert -n gatekeeper-system -o yaml | grep 'issuccess: true'"
     assert_success
     run kubectl run demo --namespace default --image=registry:5000/notation:signed
     assert_success
diff --git a/test/bats/plugin-test.bats b/test/bats/plugin-test.bats
index 0634004..73be0f2 100644
--- a/test/bats/plugin-test.bats
+++ b/test/bats/plugin-test.bats
@@ -174,18 +174,18 @@ SLEEP_TIME=1
         wait_for_process ${WAIT_TIME} ${SLEEP_TIME} 'kubectl delete pod crdtest --namespace default --force --ignore-not-found=true'
     }
 
-    echo "adding license checker, delete notary verifier and validate deployment fails due to missing notary verifier"
+    echo "adding license checker, delete notation verifier and validate deployment fails due to missing notation verifier"
     run kubectl apply -f ./config/samples/config_v1beta1_verifier_complete_licensechecker.yaml
     assert_success
-    run kubectl delete verifiers.config.ratify.deislabs.io/verifier-notary
+    run kubectl delete verifiers.config.ratify.deislabs.io/verifier-notation
     assert_success
     # wait for the httpserver cache to be invalidated
     sleep 15
     run kubectl run crdtest --namespace default --image=registry:5000/notation:signed
     assert_failure
 
-    echo "Add notary verifier and validate deployment succeeds"
-    run kubectl apply -f ./config/samples/config_v1beta1_verifier_notary.yaml
+    echo "Add notation verifier and validate deployment succeeds"
+    run kubectl apply -f ./config/samples/config_v1beta1_verifier_notation.yaml
     assert_success
 
     # wait for the httpserver cache to be invalidated
diff --git a/test/bats/tests/config/config.json b/test/bats/tests/config/config.json
index 357a588..7eb5f68 100644
--- a/test/bats/tests/config/config.json
+++ b/test/bats/tests/config/config.json
@@ -36,7 +36,7 @@
                 "key": ".staging/cosign/cosign.pub"
             },
             {
-                "name": "notaryv2",
+                "name": "notation",
                 "artifactTypes": "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
                     "~/.config/notation/localkeys/ratify-bats-test.crt"
diff --git a/test/bats/tests/config/config_notation_leaf_cert.json b/test/bats/tests/config/config_notation_leaf_cert.json
index 4133bd3..ef2b00c 100644
--- a/test/bats/tests/config/config_notation_leaf_cert.json
+++ b/test/bats/tests/config/config_notation_leaf_cert.json
@@ -19,7 +19,7 @@
         "version": "1.0.0",
         "plugins": [
             {
-                "name": "notaryv2",
+                "name": "notation",
                 "artifactTypes": "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
                     "~/.config/notation/truststore/x509/ca/leaf-test/leaf.crt"
diff --git a/test/bats/tests/config/config_notation_root_cert.json b/test/bats/tests/config/config_notation_root_cert.json
index ac8120a..a1403e9 100644
--- a/test/bats/tests/config/config_notation_root_cert.json
+++ b/test/bats/tests/config/config_notation_root_cert.json
@@ -19,7 +19,7 @@
         "version": "1.0.0",
         "plugins": [
             {
-                "name": "notaryv2",
+                "name": "notation",
                 "artifactTypes": "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
                     "~/.config/notation/truststore/x509/ca/leaf-test/root.crt"
diff --git a/test/bats/tests/config/config_rego_policy_notation_leaf_cert.json b/test/bats/tests/config/config_rego_policy_notation_leaf_cert.json
index 863d2ca..485675b 100644
--- a/test/bats/tests/config/config_rego_policy_notation_leaf_cert.json
+++ b/test/bats/tests/config/config_rego_policy_notation_leaf_cert.json
@@ -22,7 +22,7 @@
         "version": "1.0.0",
         "plugins": [
             {
-                "name": "notaryv2",
+                "name": "notation",
                 "artifactTypes": "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
                     "~/.config/notation/truststore/x509/ca/leaf-test/leaf.crt"
diff --git a/test/bats/tests/config/config_rego_policy_notation_root_cert.json b/test/bats/tests/config/config_rego_policy_notation_root_cert.json
index ea49517..57757c2 100644
--- a/test/bats/tests/config/config_rego_policy_notation_root_cert.json
+++ b/test/bats/tests/config/config_rego_policy_notation_root_cert.json
@@ -22,7 +22,7 @@
         "version": "1.0.0",
         "plugins": [
             {
-                "name": "notaryv2",
+                "name": "notation",
                 "artifactTypes": "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
                     "~/.config/notation/truststore/x509/ca/leaf-test/root.crt"
diff --git a/test/bats/tests/config/config_v1beta1_verifier_notary.yaml b/test/bats/tests/config/config_v1beta1_verifier_notation.yaml
similarity index 92%
rename from test/bats/tests/config/config_v1beta1_verifier_notary.yaml
rename to test/bats/tests/config/config_v1beta1_verifier_notation.yaml
index 1d09513..fb6595d 100644
--- a/test/bats/tests/config/config_v1beta1_verifier_notary.yaml
+++ b/test/bats/tests/config/config_v1beta1_verifier_notation.yaml
@@ -1,9 +1,9 @@
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
     verificationCertStores:
diff --git a/test/bats/tests/config/config_v1beta1_verifier_notary_akv.yaml b/test/bats/tests/config/config_v1beta1_verifier_notation_akv.yaml
similarity index 91%
rename from test/bats/tests/config/config_v1beta1_verifier_notary_akv.yaml
rename to test/bats/tests/config/config_v1beta1_verifier_notation_akv.yaml
index d103a10..1113d0a 100644
--- a/test/bats/tests/config/config_v1beta1_verifier_notary_akv.yaml
+++ b/test/bats/tests/config/config_v1beta1_verifier_notation_akv.yaml
@@ -1,9 +1,9 @@
 apiVersion: config.ratify.deislabs.io/v1beta1
 kind: Verifier
 metadata:
-  name: verifier-notary
+  name: verifier-notation
 spec:
-  name: notaryv2
+  name: notation
   artifactTypes: application/vnd.cncf.notary.signature
   parameters:
     verificationCertStores:
diff --git a/test/bats/tests/config/cosign_keyless_config.json b/test/bats/tests/config/cosign_keyless_config.json
index fdb3246..78f5676 100644
--- a/test/bats/tests/config/cosign_keyless_config.json
+++ b/test/bats/tests/config/cosign_keyless_config.json
@@ -35,7 +35,7 @@
                 "rekorURL": "https://rekor.sigstore.dev"
             },
             {
-                "name": "notaryv2",
+                "name": "notation",
                 "artifactTypes": "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
                     "~/.config/notation/localkeys/ratify-bats-test.crt"
diff --git a/test/bats/tests/config/dynamic_plugins_config.json b/test/bats/tests/config/dynamic_plugins_config.json
index 207b64a..01f9af0 100644
--- a/test/bats/tests/config/dynamic_plugins_config.json
+++ b/test/bats/tests/config/dynamic_plugins_config.json
@@ -33,7 +33,7 @@
                 }
             },
             {
-                "name": "notaryv2",
+                "name": "notation",
                 "artifactTypes": "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
                     "~/.config/notation/localkeys/ratify-bats-test.crt"
diff --git a/test/bats/tests/configmap/invalidconfigmap.yaml b/test/bats/tests/configmap/invalidconfigmap.yaml
index c3769bd..3f9413a 100644
--- a/test/bats/tests/configmap/invalidconfigmap.yaml
+++ b/test/bats/tests/configmap/invalidconfigmap.yaml
@@ -29,10 +29,10 @@ data:
           "version": "1.0.0",
           "plugins": [
             {
-                "name":"notaryv2",
+                "name":"notation",
                 "artifactTypes" : "application/vnd.cncf.notary.signature",
                 "verificationCerts": [
-                    "/usr/local/ratify-certs/notary"
+                    "/usr/local/ratify-certs/notation"
                   ]
             }
           ]
diff --git a/test/testdata/notary.crt b/test/testdata/notation.crt
similarity index 100%
rename from test/testdata/notary.crt
rename to test/testdata/notation.crt
diff --git a/test/validation.md b/test/validation.md
index 1667633..05311b3 100644
--- a/test/validation.md
+++ b/test/validation.md
@@ -11,7 +11,7 @@ While we are working on improving our coverage, here is the list of scenarios th
 
 ### CLI
 - Verifier Scenarios
-    - Notation v2
+    - Notation
     - Cosign
         - Keyed
         - Keyless 
@@ -24,7 +24,7 @@ While we are working on improving our coverage, here is the list of scenarios th
     - Store Plugin
 ### Kubernetes
 - Verifier Scenarios
-    - Notation v2
+    - Notation
     - Cosign
     - SBOM
     - License Checker