diff --git a/java-addressvalidation/.OwlBot.yaml b/java-maps-addressvalidation/.OwlBot.yaml
similarity index 59%
rename from java-addressvalidation/.OwlBot.yaml
rename to java-maps-addressvalidation/.OwlBot.yaml
index f571cf3d9b3c..fa6cd4c4be1f 100644
--- a/java-addressvalidation/.OwlBot.yaml
+++ b/java-maps-addressvalidation/.OwlBot.yaml
@@ -14,20 +14,20 @@
deep-remove-regex:
-- "/java-addressvalidation/grpc-google-.*/src"
-- "/java-addressvalidation/proto-google-.*/src"
-- "/java-addressvalidation/google-.*/src"
+- "/java-maps-addressvalidation/grpc-google-.*/src"
+- "/java-maps-addressvalidation/proto-google-.*/src"
+- "/java-maps-addressvalidation/google-.*/src"
deep-preserve-regex:
-- "/java-addressvalidation/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
+- "/java-maps-addressvalidation/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
deep-copy-regex:
- source: "/google/maps/addressvalidation/(v.*)/.*-java/proto-google-.*/src"
- dest: "/owl-bot-staging/java-addressvalidation/$1/proto-google-maps-addressvalidation-$1/src"
+ dest: "/owl-bot-staging/java-maps-addressvalidation/$1/proto-google-maps-addressvalidation-$1/src"
- source: "/google/maps/addressvalidation/(v.*)/.*-java/grpc-google-.*/src"
- dest: "/owl-bot-staging/java-addressvalidation/$1/grpc-google-maps-addressvalidation-$1/src"
+ dest: "/owl-bot-staging/java-maps-addressvalidation/$1/grpc-google-maps-addressvalidation-$1/src"
- source: "/google/maps/addressvalidation/(v.*)/.*-java/gapic-google-.*/src"
- dest: "/owl-bot-staging/java-addressvalidation/$1/google-maps-addressvalidation/src"
+ dest: "/owl-bot-staging/java-maps-addressvalidation/$1/google-maps-addressvalidation/src"
-api-name: java-addressvalidation
\ No newline at end of file
+api-name: java-maps-addressvalidation
\ No newline at end of file
diff --git a/java-addressvalidation/.repo-metadata.json b/java-maps-addressvalidation/.repo-metadata.json
similarity index 84%
rename from java-addressvalidation/.repo-metadata.json
rename to java-maps-addressvalidation/.repo-metadata.json
index ce28585577f4..7e03e1f8b106 100644
--- a/java-addressvalidation/.repo-metadata.json
+++ b/java-maps-addressvalidation/.repo-metadata.json
@@ -1,5 +1,5 @@
{
- "api_shortname": "addressvalidation",
+ "api_shortname": "maps-addressvalidation",
"name_pretty": "Address Validation API",
"product_documentation": "https://developers.google.com/maps/documentation/address-validation/",
"api_description": "The Address Validation API allows developers to verify the accuracy of addresses. Given an address, it returns information about the correctness of the components of the parsed address, a geocode, and a verdict on the deliverability of the parsed address.",
@@ -7,8 +7,8 @@
"release_level": "preview",
"transport": "grpc",
"language": "java",
- "repo": "googleapis/java-addressvalidation",
- "repo_short": "java-addressvalidation",
+ "repo": "googleapis/java-maps-addressvalidation",
+ "repo_short": "java-maps-addressvalidation",
"distribution_name": "com.google.maps:google-maps-addressvalidation",
"api_id": "addressvalidation.googleapis.com",
"library_type": "GAPIC_AUTO",
diff --git a/java-addressvalidation/README.md b/java-maps-addressvalidation/README.md
similarity index 89%
rename from java-addressvalidation/README.md
rename to java-maps-addressvalidation/README.md
index d8f7cafa373a..2a8e9ab23cc8 100644
--- a/java-addressvalidation/README.md
+++ b/java-maps-addressvalidation/README.md
@@ -165,16 +165,16 @@ Java is a registered trademark of Oracle and/or its affiliates.
[product-docs]: https://developers.google.com/maps/documentation/address-validation/
[javadocs]: https://cloud.google.com/java/docs/reference/google-maps-addressvalidation/latest/overview
-[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java7.svg
-[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java7.html
-[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java8.svg
-[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java8.html
-[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java8-osx.svg
-[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java8-osx.html
-[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java8-win.svg
-[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java8-win.html
-[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java11.svg
-[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-addressvalidation/java11.html
+[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java7.svg
+[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java7.html
+[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java8.svg
+[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java8.html
+[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java8-osx.svg
+[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java8-osx.html
+[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java8-win.svg
+[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java8-win.html
+[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java11.svg
+[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-maps-addressvalidation/java11.html
[stability-image]: https://img.shields.io/badge/stability-preview-yellow
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.maps/google-maps-addressvalidation.svg
[maven-version-link]: https://search.maven.org/search?q=g:com.google.maps%20AND%20a:google-maps-addressvalidation&core=gav
@@ -186,9 +186,9 @@ Java is a registered trademark of Oracle and/or its affiliates.
[create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
[cloud-sdk]: https://cloud.google.com/sdk/
[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
-[contributing]: https://github.com/googleapis/java-addressvalidation/blob/main/CONTRIBUTING.md
-[code-of-conduct]: https://github.com/googleapis/java-addressvalidation/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[license]: https://github.com/googleapis/java-addressvalidation/blob/main/LICENSE
+[contributing]: https://github.com/googleapis/java-maps-addressvalidation/blob/main/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/java-maps-addressvalidation/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[license]: https://github.com/googleapis/java-maps-addressvalidation/blob/main/LICENSE
[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=addressvalidation.googleapis.com
[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
diff --git a/java-addressvalidation/google-maps-addressvalidation-bom/pom.xml b/java-maps-addressvalidation/google-maps-addressvalidation-bom/pom.xml
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation-bom/pom.xml
rename to java-maps-addressvalidation/google-maps-addressvalidation-bom/pom.xml
diff --git a/java-addressvalidation/google-maps-addressvalidation/pom.xml b/java-maps-addressvalidation/google-maps-addressvalidation/pom.xml
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/pom.xml
rename to java-maps-addressvalidation/google-maps-addressvalidation/pom.xml
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationClient.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationClient.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationClient.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationClient.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationSettings.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationSettings.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationSettings.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationSettings.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/gapic_metadata.json b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/gapic_metadata.json
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/gapic_metadata.json
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/gapic_metadata.json
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/package-info.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/package-info.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/package-info.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/package-info.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/AddressValidationStub.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/AddressValidationStub.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/AddressValidationStub.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/AddressValidationStub.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/AddressValidationStubSettings.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/AddressValidationStubSettings.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/AddressValidationStubSettings.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/AddressValidationStubSettings.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/GrpcAddressValidationCallableFactory.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/GrpcAddressValidationCallableFactory.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/GrpcAddressValidationCallableFactory.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/GrpcAddressValidationCallableFactory.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/GrpcAddressValidationStub.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/GrpcAddressValidationStub.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/GrpcAddressValidationStub.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/GrpcAddressValidationStub.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationCallableFactory.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationCallableFactory.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationCallableFactory.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationCallableFactory.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationStub.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationStub.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationStub.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationStub.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/AddressValidationClientHttpJsonTest.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/AddressValidationClientHttpJsonTest.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/AddressValidationClientHttpJsonTest.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/AddressValidationClientHttpJsonTest.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/AddressValidationClientTest.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/AddressValidationClientTest.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/AddressValidationClientTest.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/AddressValidationClientTest.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/MockAddressValidation.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/MockAddressValidation.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/MockAddressValidation.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/MockAddressValidation.java
diff --git a/java-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/MockAddressValidationImpl.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/MockAddressValidationImpl.java
similarity index 100%
rename from java-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/MockAddressValidationImpl.java
rename to java-maps-addressvalidation/google-maps-addressvalidation/src/test/java/com/google/maps/addressvalidation/v1/MockAddressValidationImpl.java
diff --git a/java-addressvalidation/grpc-google-maps-addressvalidation-v1/pom.xml b/java-maps-addressvalidation/grpc-google-maps-addressvalidation-v1/pom.xml
similarity index 100%
rename from java-addressvalidation/grpc-google-maps-addressvalidation-v1/pom.xml
rename to java-maps-addressvalidation/grpc-google-maps-addressvalidation-v1/pom.xml
diff --git a/java-addressvalidation/grpc-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationGrpc.java b/java-maps-addressvalidation/grpc-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationGrpc.java
similarity index 100%
rename from java-addressvalidation/grpc-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationGrpc.java
rename to java-maps-addressvalidation/grpc-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationGrpc.java
diff --git a/java-addressvalidation/owlbot.py b/java-maps-addressvalidation/owlbot.py
similarity index 100%
rename from java-addressvalidation/owlbot.py
rename to java-maps-addressvalidation/owlbot.py
diff --git a/java-addressvalidation/pom.xml b/java-maps-addressvalidation/pom.xml
similarity index 100%
rename from java-addressvalidation/pom.xml
rename to java-maps-addressvalidation/pom.xml
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/clirr-ignored-differences.xml b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/clirr-ignored-differences.xml
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/clirr-ignored-differences.xml
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/clirr-ignored-differences.xml
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/pom.xml b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/pom.xml
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/pom.xml
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/pom.xml
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Address.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Address.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Address.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Address.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressComponent.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressComponent.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressComponent.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressComponent.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressComponentOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressComponentOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressComponentOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressComponentOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressMetadata.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressMetadata.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressMetadata.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressMetadata.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressMetadataOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressMetadataOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressMetadataOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressMetadataOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressProto.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressProto.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressProto.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressProto.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationServiceProto.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationServiceProto.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationServiceProto.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/AddressValidationServiceProto.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ComponentName.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ComponentName.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ComponentName.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ComponentName.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ComponentNameOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ComponentNameOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ComponentNameOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ComponentNameOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Geocode.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Geocode.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Geocode.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Geocode.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/GeocodeOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/GeocodeOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/GeocodeOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/GeocodeOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/GeocodeProto.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/GeocodeProto.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/GeocodeProto.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/GeocodeProto.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/MetadataProto.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/MetadataProto.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/MetadataProto.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/MetadataProto.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/PlusCode.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/PlusCode.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/PlusCode.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/PlusCode.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/PlusCodeOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/PlusCodeOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/PlusCodeOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/PlusCodeOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequest.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequest.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequest.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequest.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequestOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequestOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequestOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequestOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackResponse.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackResponse.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackResponse.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackResponse.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackResponseOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackResponseOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackResponseOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackResponseOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsAddress.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsAddress.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsAddress.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsAddress.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsAddressOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsAddressOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsAddressOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsAddressOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsData.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsData.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsData.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsData.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsDataOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsDataOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsDataOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsDataOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsDataProto.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsDataProto.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsDataProto.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/UspsDataProto.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressRequest.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressRequest.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressRequest.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressRequest.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressRequestOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressRequestOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressRequestOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressRequestOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressResponse.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressResponse.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressResponse.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressResponse.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressResponseOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressResponseOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressResponseOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidateAddressResponseOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidationResult.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidationResult.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidationResult.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidationResult.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidationResultOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidationResultOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidationResultOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ValidationResultOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Verdict.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Verdict.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Verdict.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Verdict.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/VerdictOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/VerdictOrBuilder.java
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/VerdictOrBuilder.java
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/VerdictOrBuilder.java
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address.proto b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address.proto
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address.proto
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address.proto
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address_validation_service.proto b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address_validation_service.proto
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address_validation_service.proto
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address_validation_service.proto
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/geocode.proto b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/geocode.proto
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/geocode.proto
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/geocode.proto
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/metadata.proto b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/metadata.proto
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/metadata.proto
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/metadata.proto
diff --git a/java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/usps_data.proto b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/usps_data.proto
similarity index 100%
rename from java-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/usps_data.proto
rename to java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/usps_data.proto
diff --git a/pom.xml b/pom.xml
index 64a67ccb5afe..362e9f8bfa59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
google-cloud-pom-parent
java-accessapproval
java-accesscontextmanager
- java-addressvalidation
java-aiplatform
java-analytics-admin
java-analytics-data
@@ -98,6 +97,7 @@
java-language
java-life-sciences
java-managed-identities
+ java-maps-addressvalidation
java-maps-routing
java-mediatranslation
java-memcache