diff --git a/models/spring-ai-watsonx-ai/pom.xml b/models/spring-ai-watsonx-ai/pom.xml
index 8cd07c4e2..7f28cc147 100644
--- a/models/spring-ai-watsonx-ai/pom.xml
+++ b/models/spring-ai-watsonx-ai/pom.xml
@@ -11,6 +11,8 @@
 
     <artifactId>spring-ai-watsonx-ai</artifactId>
 
+    <name>Spring AI WatsonX AI</name>
+
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
diff --git a/pom.xml b/pom.xml
index 771b4e5ad..d9f873b09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,8 +57,8 @@
 		<module>document-readers/tika-reader</module>
 		<module>vector-stores/spring-ai-pinecone</module>
 		<module>vector-stores/spring-ai-chroma-store</module>
-		<module>vector-stores/spring-ai-azure-vector-store</module>
-		<module>vector-stores/spring-ai-weaviate</module>
+		<module>vector-stores/spring-ai-azure-store</module>
+		<module>vector-stores/spring-ai-weaviate-store</module>
 		<module>vector-stores/spring-ai-redis</module>
 		<module>vector-stores/spring-ai-gemfire</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-vertex-ai-palm2</module>
diff --git a/vector-stores/spring-ai-azure-vector-store/README.md b/vector-stores/spring-ai-azure-store/README.md
similarity index 100%
rename from vector-stores/spring-ai-azure-vector-store/README.md
rename to vector-stores/spring-ai-azure-store/README.md
diff --git a/vector-stores/spring-ai-azure-vector-store/pom.xml b/vector-stores/spring-ai-azure-store/pom.xml
similarity index 93%
rename from vector-stores/spring-ai-azure-vector-store/pom.xml
rename to vector-stores/spring-ai-azure-store/pom.xml
index 08f680f83..19dbf15af 100644
--- a/vector-stores/spring-ai-azure-vector-store/pom.xml
+++ b/vector-stores/spring-ai-azure-store/pom.xml
@@ -8,10 +8,10 @@
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-ai-azure-vector-store</artifactId>
+	<artifactId>spring-ai-azure-store</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI - Azure AI Search Vector Store</name>
-	<description>Spring AI - Azure AI Search Vector Store</description>
+	<name>Spring AI Vector Store - Azure AI Search </name>
+	<description> Spring AI Vector Store - Azure AI Search  </description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
 	<scm>
diff --git a/vector-stores/spring-ai-azure-vector-store/src/main/java/org/springframework/ai/vectorstore/azure/AzureAiSearchFilterExpressionConverter.java b/vector-stores/spring-ai-azure-store/src/main/java/org/springframework/ai/vectorstore/azure/AzureAiSearchFilterExpressionConverter.java
similarity index 100%
rename from vector-stores/spring-ai-azure-vector-store/src/main/java/org/springframework/ai/vectorstore/azure/AzureAiSearchFilterExpressionConverter.java
rename to vector-stores/spring-ai-azure-store/src/main/java/org/springframework/ai/vectorstore/azure/AzureAiSearchFilterExpressionConverter.java
diff --git a/vector-stores/spring-ai-azure-vector-store/src/main/java/org/springframework/ai/vectorstore/azure/AzureVectorStore.java b/vector-stores/spring-ai-azure-store/src/main/java/org/springframework/ai/vectorstore/azure/AzureVectorStore.java
similarity index 100%
rename from vector-stores/spring-ai-azure-vector-store/src/main/java/org/springframework/ai/vectorstore/azure/AzureVectorStore.java
rename to vector-stores/spring-ai-azure-store/src/main/java/org/springframework/ai/vectorstore/azure/AzureVectorStore.java
diff --git a/vector-stores/spring-ai-azure-vector-store/src/test/java/org/springframework/ai/vectorstore/azure/AzureAiSearchFilterExpressionConverterTests.java b/vector-stores/spring-ai-azure-store/src/test/java/org/springframework/ai/vectorstore/azure/AzureAiSearchFilterExpressionConverterTests.java
similarity index 100%
rename from vector-stores/spring-ai-azure-vector-store/src/test/java/org/springframework/ai/vectorstore/azure/AzureAiSearchFilterExpressionConverterTests.java
rename to vector-stores/spring-ai-azure-store/src/test/java/org/springframework/ai/vectorstore/azure/AzureAiSearchFilterExpressionConverterTests.java
diff --git a/vector-stores/spring-ai-azure-vector-store/src/test/java/org/springframework/ai/vectorstore/azure/AzureVectorStoreIT.java b/vector-stores/spring-ai-azure-store/src/test/java/org/springframework/ai/vectorstore/azure/AzureVectorStoreIT.java
similarity index 100%
rename from vector-stores/spring-ai-azure-vector-store/src/test/java/org/springframework/ai/vectorstore/azure/AzureVectorStoreIT.java
rename to vector-stores/spring-ai-azure-store/src/test/java/org/springframework/ai/vectorstore/azure/AzureVectorStoreIT.java
diff --git a/vector-stores/spring-ai-chroma-store/pom.xml b/vector-stores/spring-ai-chroma-store/pom.xml
index d6232a576..586c6a88b 100644
--- a/vector-stores/spring-ai-chroma-store/pom.xml
+++ b/vector-stores/spring-ai-chroma-store/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>spring-ai-chroma-store</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI Chroma Vector Store</name>
+	<name>Spring AI Vector Store - Chroma</name>
 	<description>Spring AI Chroma Vector Store</description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
diff --git a/vector-stores/spring-ai-chroma-store/src/main/java/org/springframework/ai/vectorstore/ChromaVectorStore.java b/vector-stores/spring-ai-chroma-store/src/main/java/org/springframework/ai/vectorstore/ChromaVectorStore.java
index 3c9741cbe..e3c03863d 100644
--- a/vector-stores/spring-ai-chroma-store/src/main/java/org/springframework/ai/vectorstore/ChromaVectorStore.java
+++ b/vector-stores/spring-ai-chroma-store/src/main/java/org/springframework/ai/vectorstore/ChromaVectorStore.java
@@ -38,7 +38,7 @@ import java.util.*;
  * for embedding calculations. For more information about how it does this, see the
  * official <a href="https://www.trychroma.com/">Chroma website</a>.
  *
- * @author Josh Long
+ *
  */
 public class ChromaVectorStore implements VectorStore, ApplicationListener<ApplicationReadyEvent> {
 
diff --git a/vector-stores/spring-ai-milvus-store/pom.xml b/vector-stores/spring-ai-milvus-store/pom.xml
index 460f9dbbf..798ef5be0 100644
--- a/vector-stores/spring-ai-milvus-store/pom.xml
+++ b/vector-stores/spring-ai-milvus-store/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	<artifactId>spring-ai-milvus-store</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI Milvus Vector Store</name>
-	<description>Spring AI Milvus Vector Store</description>
+	<name>Spring AI Vector Store - Milvus</name>
+	<description>Spring AI Vector Store - Milvus </description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
 	<scm>
diff --git a/vector-stores/spring-ai-mongodb-atlas-store/pom.xml b/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
index 5c71ee236..abf7a5a2d 100644
--- a/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
+++ b/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
@@ -10,8 +10,8 @@
     </parent>
     <artifactId>spring-ai-mongodb-atlas-store</artifactId>
     <packaging>jar</packaging>
-    <name>Spring AI MongoDB Atlas Vector Store</name>
-    <description>Spring AI MongoDB Atlas Vector Store</description>
+    <name>Spring AI Vector Store - MongoDB Atlas  </name>
+    <description>Spring AI Vector Store - MongoDB Atlas</description>
     <url>https://github.com/spring-projects-experimental/spring-ai</url>
 
     <scm>
diff --git a/vector-stores/spring-ai-neo4j-store/pom.xml b/vector-stores/spring-ai-neo4j-store/pom.xml
index 430f6f0eb..9cbb5a1e2 100644
--- a/vector-stores/spring-ai-neo4j-store/pom.xml
+++ b/vector-stores/spring-ai-neo4j-store/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>spring-ai-neo4j-store</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI Vector Store - neo4j</name>
+	<name>Spring AI Vector Store - Neo4J</name>
 	<description>Spring AI Neo4j Vector Store</description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
diff --git a/vector-stores/spring-ai-pgvector-store/pom.xml b/vector-stores/spring-ai-pgvector-store/pom.xml
index 9c23e4b05..056e6e172 100644
--- a/vector-stores/spring-ai-pgvector-store/pom.xml
+++ b/vector-stores/spring-ai-pgvector-store/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>spring-ai-pgvector-store</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI Vector Store - pgvector</name>
+	<name>Spring AI Vector Store - PGVector</name>
 	<description>Spring AI PGVector Vector Store</description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
diff --git a/vector-stores/spring-ai-pinecone/pom.xml b/vector-stores/spring-ai-pinecone/pom.xml
index f9a40f83b..38fe9c4fd 100644
--- a/vector-stores/spring-ai-pinecone/pom.xml
+++ b/vector-stores/spring-ai-pinecone/pom.xml
@@ -10,8 +10,7 @@
     </parent>
     <artifactId>spring-ai-pinecone</artifactId>
     <packaging>jar</packaging>
-    <name>spring-ai-pinecone</name>
-    <description>spring-ai-pinecone</description>
+    <name>Spring AI Vector Store - Pinecone </name>
     <url>https://github.com/spring-projects/spring-ai</url>
 
     <scm>
diff --git a/vector-stores/spring-ai-qdrant/pom.xml b/vector-stores/spring-ai-qdrant/pom.xml
index 95c578d28..77ec45ffa 100644
--- a/vector-stores/spring-ai-qdrant/pom.xml
+++ b/vector-stores/spring-ai-qdrant/pom.xml
@@ -10,8 +10,8 @@
     </parent>
     <artifactId>spring-ai-qdrant</artifactId>
     <packaging>jar</packaging>
-    <name>spring-ai-qdrant</name>
-    <description>spring-ai-qdrant</description>
+    <name>Spring AI Vector Store - QDrant</name>
+
     <url>https://github.com/spring-projects/spring-ai</url>
 
     <scm>
diff --git a/vector-stores/spring-ai-qdrant/src/main/java/org/springframework/ai/vectorstore/qdrant/QdrantVectorStore.java b/vector-stores/spring-ai-qdrant/src/main/java/org/springframework/ai/vectorstore/qdrant/QdrantVectorStore.java
index 1b54c2f00..607a1ecb7 100644
--- a/vector-stores/spring-ai-qdrant/src/main/java/org/springframework/ai/vectorstore/qdrant/QdrantVectorStore.java
+++ b/vector-stores/spring-ai-qdrant/src/main/java/org/springframework/ai/vectorstore/qdrant/QdrantVectorStore.java
@@ -261,7 +261,6 @@ public class QdrantVectorStore implements VectorStore, ApplicationListener<Appli
 
 	/**
 	 * Extracts metadata from a Protobuf Struct.
-	 * @param metadataStruct The Protobuf Struct containing metadata.
 	 * @return The metadata as a map.
 	 */
 	private Document toDocument(ScoredPoint point) {
diff --git a/vector-stores/spring-ai-redis/pom.xml b/vector-stores/spring-ai-redis/pom.xml
index ebf2cc44f..2d66f35c7 100644
--- a/vector-stores/spring-ai-redis/pom.xml
+++ b/vector-stores/spring-ai-redis/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	<artifactId>spring-ai-redis</artifactId>
 	<packaging>jar</packaging>
-	<name>spring-ai-redis</name>
-	<description>Spring AI Redis Vector Store</description>
+	<name>Spring AI Vector Store - Redis  </name>
+	<description>Spring AI Vector Store - Redis </description>
     <url>https://github.com/spring-projects/spring-ai</url>
 
 	<scm>
diff --git a/vector-stores/spring-ai-weaviate/README.md b/vector-stores/spring-ai-weaviate-store/README.md
similarity index 100%
rename from vector-stores/spring-ai-weaviate/README.md
rename to vector-stores/spring-ai-weaviate-store/README.md
diff --git a/vector-stores/spring-ai-weaviate/pom.xml b/vector-stores/spring-ai-weaviate-store/pom.xml
similarity index 96%
rename from vector-stores/spring-ai-weaviate/pom.xml
rename to vector-stores/spring-ai-weaviate-store/pom.xml
index 523d341c7..7324f9c7d 100644
--- a/vector-stores/spring-ai-weaviate/pom.xml
+++ b/vector-stores/spring-ai-weaviate-store/pom.xml
@@ -10,8 +10,7 @@
     </parent>
     <artifactId>spring-ai-weaviate-store</artifactId>
     <packaging>jar</packaging>
-    <name>spring-ai-weaviate-store</name>
-    <description>spring-ai-weaviate</description>
+    <name>Spring AI Vector Store - Weaviate </name>
     <url>https://github.com/spring-projects/spring-ai</url>
 
     <scm>
diff --git a/vector-stores/spring-ai-weaviate/src/main/java/org/springframework/ai/vectorstore/WeaviateFilterExpressionConverter.java b/vector-stores/spring-ai-weaviate-store/src/main/java/org/springframework/ai/vectorstore/WeaviateFilterExpressionConverter.java
similarity index 100%
rename from vector-stores/spring-ai-weaviate/src/main/java/org/springframework/ai/vectorstore/WeaviateFilterExpressionConverter.java
rename to vector-stores/spring-ai-weaviate-store/src/main/java/org/springframework/ai/vectorstore/WeaviateFilterExpressionConverter.java
diff --git a/vector-stores/spring-ai-weaviate/src/main/java/org/springframework/ai/vectorstore/WeaviateVectorStore.java b/vector-stores/spring-ai-weaviate-store/src/main/java/org/springframework/ai/vectorstore/WeaviateVectorStore.java
similarity index 100%
rename from vector-stores/spring-ai-weaviate/src/main/java/org/springframework/ai/vectorstore/WeaviateVectorStore.java
rename to vector-stores/spring-ai-weaviate-store/src/main/java/org/springframework/ai/vectorstore/WeaviateVectorStore.java
diff --git a/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateFilterExpressionConverterTests.java b/vector-stores/spring-ai-weaviate-store/src/test/java/org/springframework/ai/vectorstore/WeaviateFilterExpressionConverterTests.java
similarity index 100%
rename from vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateFilterExpressionConverterTests.java
rename to vector-stores/spring-ai-weaviate-store/src/test/java/org/springframework/ai/vectorstore/WeaviateFilterExpressionConverterTests.java
diff --git a/vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java b/vector-stores/spring-ai-weaviate-store/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java
similarity index 100%
rename from vector-stores/spring-ai-weaviate/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java
rename to vector-stores/spring-ai-weaviate-store/src/test/java/org/springframework/ai/vectorstore/WeaviateVectorStoreIT.java
diff --git a/vector-stores/spring-ai-weaviate/src/test/resources/docker-compose.yml b/vector-stores/spring-ai-weaviate-store/src/test/resources/docker-compose.yml
similarity index 100%
rename from vector-stores/spring-ai-weaviate/src/test/resources/docker-compose.yml
rename to vector-stores/spring-ai-weaviate-store/src/test/resources/docker-compose.yml