diff --git a/README.md b/README.md
index 475850c..3ce0779 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# tigrisdb-starter-java
-A starter Java application for TigrisDB.
+# tigris-starter-java
+A starter Java application for Tigris.
 
-[![java-ci](https://github.com/tigrisdata/tigrisdb-example-java/actions/workflows/java-ci.yml/badge.svg?branch=main)](https://github.com/tigrisdata/tigrisdb-example-java/actions/workflows/java-ci.yml)
+[![java-ci](https://github.com/tigrisdata/tigris-starter-java/actions/workflows/java-ci.yml/badge.svg?branch=main)](https://github.com/tigrisdata/tigris-starter-java/actions/workflows/java-ci.yml)
 
 # Quick start
  - [documentation](https://docs.tigrisdata.com/quickstart/with-java)
diff --git a/pom.xml b/pom.xml
index 63ddc08..ed1b3b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tigrisdata</groupId>
-    <artifactId>tigrisdb-example-java</artifactId>
-    <version>1.0.0-alpha.6</version>
+    <artifactId>tigris-example-java</artifactId>
+    <version>1.0.0-alpha.8</version>
 
     <dependencies>
         <dependency>
             <groupId>com.tigrisdata</groupId>
-            <artifactId>tigrisdb-client</artifactId>
-            <version>${tigrisdb.client.java.version}</version>
+            <artifactId>tigris-client</artifactId>
+            <version>${tigris.client.java.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -26,7 +26,7 @@
     </dependencies>
     <properties>
         <!-- we are still pre-release -->
-        <tigrisdb.client.java.version>1.0.0-alpha.7</tigrisdb.client.java.version>
+        <tigris.client.java.version>1.0.0-alpha.8</tigris.client.java.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/com/tigrisdata/starter/TigrisDBStarterApplication.java b/src/main/java/com/tigrisdata/starter/TigrisStarterApplication.java
similarity index 87%
rename from src/main/java/com/tigrisdata/starter/TigrisDBStarterApplication.java
rename to src/main/java/com/tigrisdata/starter/TigrisStarterApplication.java
index b699466..86347f3 100644
--- a/src/main/java/com/tigrisdata/starter/TigrisDBStarterApplication.java
+++ b/src/main/java/com/tigrisdata/starter/TigrisStarterApplication.java
@@ -17,9 +17,9 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class TigrisDBStarterApplication {
+public class TigrisStarterApplication {
 
   public static void main(String[] args) {
-    new SpringApplication(TigrisDBStarterApplication.class).run(args);
+    new SpringApplication(TigrisStarterApplication.class).run(args);
   }
 }
diff --git a/src/main/java/com/tigrisdata/starter/controller/TigrisDBExceptionAdvice.java b/src/main/java/com/tigrisdata/starter/controller/TigrisExceptionAdvice.java
similarity index 97%
rename from src/main/java/com/tigrisdata/starter/controller/TigrisDBExceptionAdvice.java
rename to src/main/java/com/tigrisdata/starter/controller/TigrisExceptionAdvice.java
index 9496cbe..042bb4f 100644
--- a/src/main/java/com/tigrisdata/starter/controller/TigrisDBExceptionAdvice.java
+++ b/src/main/java/com/tigrisdata/starter/controller/TigrisExceptionAdvice.java
@@ -21,7 +21,7 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice
-public class TigrisDBExceptionAdvice {
+public class TigrisExceptionAdvice {
 
   @ResponseBody
   @ExceptionHandler(TigrisException.class)
diff --git a/src/main/java/com/tigrisdata/starter/spring/TigrisDBInitializer.java b/src/main/java/com/tigrisdata/starter/spring/TigrisInitializer.java
similarity index 78%
rename from src/main/java/com/tigrisdata/starter/spring/TigrisDBInitializer.java
rename to src/main/java/com/tigrisdata/starter/spring/TigrisInitializer.java
index 07ffa26..2f8650a 100644
--- a/src/main/java/com/tigrisdata/starter/spring/TigrisDBInitializer.java
+++ b/src/main/java/com/tigrisdata/starter/spring/TigrisInitializer.java
@@ -22,24 +22,24 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;
 
-public class TigrisDBInitializer implements CommandLineRunner {
+public class TigrisInitializer implements CommandLineRunner {
 
-  private final TigrisClient tigrisDBClient;
+  private final TigrisClient tigrisClient;
   private final String dbName;
 
-  private static final Logger log = LoggerFactory.getLogger(TigrisDBInitializer.class);
+  private static final Logger log = LoggerFactory.getLogger(TigrisInitializer.class);
 
-  public TigrisDBInitializer(TigrisClient tigrisDBClient, String dbName) {
-    this.tigrisDBClient = tigrisDBClient;
+  public TigrisInitializer(TigrisClient tigrisClient, String dbName) {
+    this.tigrisClient = tigrisClient;
     this.dbName = dbName;
   }
 
   @Override
   public void run(String... args) throws Exception {
     log.info("createDbIfNotExists db: {}", dbName);
-    TigrisDatabase tigrisDatabase = tigrisDBClient.createDatabaseIfNotExists(dbName);
+    TigrisDatabase tigrisDatabase = tigrisClient.createDatabaseIfNotExists(dbName);
     log.info("creating collections on db {}", dbName);
     tigrisDatabase.createOrUpdateCollections(User.class, Product.class, Order.class);
-    log.info("Finished initializing TigrisDB");
+    log.info("Finished initializing Tigris");
   }
 }
diff --git a/src/main/java/com/tigrisdata/starter/spring/TigrisDBSpringConfiguration.java b/src/main/java/com/tigrisdata/starter/spring/TigrisSpringConfiguration.java
similarity index 76%
rename from src/main/java/com/tigrisdata/starter/spring/TigrisDBSpringConfiguration.java
rename to src/main/java/com/tigrisdata/starter/spring/TigrisSpringConfiguration.java
index 135dd7e..298a1ec 100644
--- a/src/main/java/com/tigrisdata/starter/spring/TigrisDBSpringConfiguration.java
+++ b/src/main/java/com/tigrisdata/starter/spring/TigrisSpringConfiguration.java
@@ -22,17 +22,17 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class TigrisDBSpringConfiguration {
+public class TigrisSpringConfiguration {
   @Bean
   public TigrisDatabase tigrisDatabase(
-      @Value("${tigrisdb.db.name}") String dbName, TigrisClient client) {
+      @Value("${tigris.db.name}") String dbName, TigrisClient client) {
     return client.getDatabase(dbName);
   }
 
   @Bean
-  public TigrisClient tigrisDBClient(
-      @Value("${tigrisdb.server.url}") String serverURL,
-      @Value("${tigrisdb.network.usePlainText:false}") boolean usePlainText) {
+  public TigrisClient tigrisClient(
+      @Value("${tigris.server.url}") String serverURL,
+      @Value("${tigris.network.usePlainText:false}") boolean usePlainText) {
     TigrisConfiguration.NetworkConfig.Builder networkConfigBuilder =
             TigrisConfiguration.NetworkConfig.newBuilder();
     if (usePlainText) {
@@ -46,8 +46,8 @@ public TigrisClient tigrisDBClient(
   }
 
   @Bean
-  public TigrisDBInitializer tigrisDBInitializr(
-          TigrisClient tigrisDBClient, @Value("${tigrisdb.db.name}") String dbName) {
-    return new TigrisDBInitializer(tigrisDBClient, dbName);
+  public TigrisInitializer tigrisInitializr(
+          TigrisClient tigrisClient, @Value("${tigris.db.name}") String dbName) {
+    return new TigrisInitializer(tigrisClient, dbName);
   }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b030bca..f64474d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,9 @@
 server:
   port: 8080
 
-tigrisdb:
+tigris:
   db:
-    name: "tigrisdb-starter-java"
+    name: "tigris-starter-java"
   server:
     url: "localhost:8081"
   network: