diff --git a/core/pom.xml b/core/pom.xml
index f2da192..6f2d92f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
-        <artifactId>thjazi</artifactId>
+        <artifactId>tjahzi</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/LogBufferAgent.java b/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
similarity index 95%
rename from core/src/main/java/pl/tkowalcz/thjazi/LogBufferAgent.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
index e770439..d7d9264 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/LogBufferAgent.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/LogBufferAgent.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi;
+package pl.tkowalcz.tjahzi;
 
 import com.google.protobuf.Timestamp;
 import io.netty.buffer.ByteBuf;
@@ -10,8 +10,8 @@ import org.agrona.MutableDirectBuffer;
 import org.agrona.concurrent.Agent;
 import org.agrona.concurrent.MessageHandler;
 import org.agrona.concurrent.ringbuffer.ManyToOneRingBuffer;
-import pl.tkowalcz.thjazi.http.NettyHttpClient;
-import pl.tkowalcz.thjazi.http.TextBuilders;
+import pl.tkowalcz.tjahzi.http.NettyHttpClient;
+import pl.tkowalcz.tjahzi.http.TextBuilders;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -57,7 +57,7 @@ public class LogBufferAgent implements Agent, MessageHandler {
 
     @Override
     public void onMessage(int msgTypeId, MutableDirectBuffer buffer, int index, int length) {
-        if (msgTypeId == ThjaziLogger.LOG_MESSAGE_TYPE_ID) {
+        if (msgTypeId == TjahziLogger.LOG_MESSAGE_TYPE_ID) {
             processMessage(buffer, index);
         } else {
             // Ignore
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/LoggingSystem.java b/core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
similarity index 69%
rename from core/src/main/java/pl/tkowalcz/thjazi/LoggingSystem.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
index 8dd6e11..4ce1677 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/LoggingSystem.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/LoggingSystem.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi;
+package pl.tkowalcz.tjahzi;
 
 import org.agrona.concurrent.ringbuffer.ManyToOneRingBuffer;
 
@@ -10,7 +10,7 @@ public class LoggingSystem {
         this.logBuffer = logBuffer;
     }
 
-    public ThjaziLogger createLogger() {
-        return new ThjaziLogger(logBuffer);
+    public TjahziLogger createLogger() {
+        return new TjahziLogger(logBuffer);
     }
 }
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/ThjaziInitializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/ThjaziInitializer.java
similarity index 93%
rename from core/src/main/java/pl/tkowalcz/thjazi/ThjaziInitializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/ThjaziInitializer.java
index 445d92d..6c2aac4 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/ThjaziInitializer.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/ThjaziInitializer.java
@@ -1,15 +1,15 @@
-package pl.tkowalcz.thjazi;
+package pl.tkowalcz.tjahzi;
 
 import org.agrona.concurrent.AgentRunner;
 import org.agrona.concurrent.SleepingMillisIdleStrategy;
 import org.agrona.concurrent.UnsafeBuffer;
 import org.agrona.concurrent.ringbuffer.ManyToOneRingBuffer;
 import org.agrona.concurrent.ringbuffer.RingBufferDescriptor;
-import pl.tkowalcz.thjazi.http.NettyHttpClient;
+import pl.tkowalcz.tjahzi.http.NettyHttpClient;
 
 import java.nio.ByteBuffer;
 
-public class ThjaziInitializer {
+public class TjahziInitializer {
 
     public LoggingSystem createLoggingSystem(
             NettyHttpClient httpClient,
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/ThjaziLogger.java b/core/src/main/java/pl/tkowalcz/tjahzi/ThjaziLogger.java
similarity index 92%
rename from core/src/main/java/pl/tkowalcz/thjazi/ThjaziLogger.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/ThjaziLogger.java
index ee0f47c..820c0bb 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/ThjaziLogger.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/ThjaziLogger.java
@@ -1,21 +1,21 @@
-package pl.tkowalcz.thjazi;
+package pl.tkowalcz.tjahzi;
 
 import org.agrona.concurrent.AtomicBuffer;
 import org.agrona.concurrent.ringbuffer.ManyToOneRingBuffer;
 
 import java.util.Map;
 
-public class ThjaziLogger {
+public class TjahziLogger {
 
     public static final int LOG_MESSAGE_TYPE_ID = 5;
 
     private final ManyToOneRingBuffer logBuffer;
 
-    public ThjaziLogger(ManyToOneRingBuffer logBuffer) {
+    public TjahziLogger(ManyToOneRingBuffer logBuffer) {
         this.logBuffer = logBuffer;
     }
 
-    public ThjaziLogger log(long timestamp,
+    public TjahziLogger log(long timestamp,
                             Map<String, String> labels,
                             String line) {
         int requiredSize = calculateRequiredSizeAscii(labels, line);
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/http/ClientConfiguration.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
similarity index 97%
rename from core/src/main/java/pl/tkowalcz/thjazi/http/ClientConfiguration.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
index 5605d13..ed6030e 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/http/ClientConfiguration.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfiguration.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi.http;
+package pl.tkowalcz.tjahzi.http;
 
 public class ClientConfiguration {
 
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/http/ClientConfigurationBuilder.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
similarity index 98%
rename from core/src/main/java/pl/tkowalcz/thjazi/http/ClientConfigurationBuilder.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
index 6c487cc..6a8f095 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/http/ClientConfigurationBuilder.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/http/ClientConfigurationBuilder.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi.http;
+package pl.tkowalcz.tjahzi.http;
 
 public class ClientConfigurationBuilder {
 
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/http/HttpClientFactory.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
similarity index 91%
rename from core/src/main/java/pl/tkowalcz/thjazi/http/HttpClientFactory.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
index 19cb957..5db0ad6 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/http/HttpClientFactory.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientFactory.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi.http;
+package pl.tkowalcz.tjahzi.http;
 
 public class HttpClientFactory {
 
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/http/HttpClientInitializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java
similarity index 96%
rename from core/src/main/java/pl/tkowalcz/thjazi/http/HttpClientInitializer.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java
index a776b9c..4a2d2ee 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/http/HttpClientInitializer.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/http/HttpClientInitializer.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi.http;
+package pl.tkowalcz.tjahzi.http;
 
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/http/NettyHttpClient.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
similarity index 95%
rename from core/src/main/java/pl/tkowalcz/thjazi/http/NettyHttpClient.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
index 8912dbb..0a44bbd 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/http/NettyHttpClient.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/http/NettyHttpClient.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi.http;
+package pl.tkowalcz.tjahzi.http;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.ByteBuf;
@@ -27,8 +27,8 @@ public class NettyHttpClient implements AutoCloseable {
         host = clientConfiguration.getHost();
         logEndpoint = clientConfiguration.getLogEndpoint();
 
-        ThreadGroup threadGroup = new ThreadGroup("Thjazi Loki client");
-        ThreadFactory threadFactory = r -> new Thread(threadGroup, r, "thjazi-worker");
+        ThreadGroup threadGroup = new ThreadGroup("Tjahzi Loki client");
+        ThreadFactory threadFactory = r -> new Thread(threadGroup, r, "tjahzi-worker");
         group = new NioEventLoopGroup(1, threadFactory);
 
         Bootstrap bootstrap = new Bootstrap();
diff --git a/core/src/main/java/pl/tkowalcz/thjazi/http/TextBuilders.java b/core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
similarity index 93%
rename from core/src/main/java/pl/tkowalcz/thjazi/http/TextBuilders.java
rename to core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
index 56585a7..e45fa15 100644
--- a/core/src/main/java/pl/tkowalcz/thjazi/http/TextBuilders.java
+++ b/core/src/main/java/pl/tkowalcz/tjahzi/http/TextBuilders.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi.http;
+package pl.tkowalcz.tjahzi.http;
 
 import io.netty.util.concurrent.FastThreadLocal;
 import javolution.text.TextBuilder;
diff --git a/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java b/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java
index c47c6bd..b575a81 100644
--- a/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java
+++ b/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemSanityCheckTest.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi;
+package pl.tkowalcz.tjahzi;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -12,9 +12,9 @@ import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import pl.tkowalcz.thjazi.http.ClientConfiguration;
-import pl.tkowalcz.thjazi.http.HttpClientFactory;
-import pl.tkowalcz.thjazi.http.NettyHttpClient;
+import pl.tkowalcz.tjahzi.http.ClientConfiguration;
+import pl.tkowalcz.tjahzi.http.HttpClientFactory;
+import pl.tkowalcz.tjahzi.http.NettyHttpClient;
 
 import java.util.Map;
 import java.util.function.Consumer;
@@ -56,7 +56,7 @@ class LoggingSystemSanityCheckTest {
         NettyHttpClient httpClient = HttpClientFactory.defaultFactory()
                 .getHttpClient(clientConfiguration);
 
-        ThjaziInitializer initializer = new ThjaziInitializer();
+        TjahziInitializer initializer = new TjahziInitializer();
         LoggingSystem loggingSystem = initializer.createLoggingSystem(
                 httpClient,
                 1024 * 1024,
@@ -65,7 +65,7 @@ class LoggingSystemSanityCheckTest {
 
         long timestamp = System.currentTimeMillis();
 
-        ThjaziLogger logger = loggingSystem.createLogger();
+        TjahziLogger logger = loggingSystem.createLogger();
         logger.log(
                 timestamp,
                 Map.of("version", "0.43", "server", "127.0.0.1"),
diff --git a/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java b/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java
index 2028ddd..31bb46d 100644
--- a/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java
+++ b/core/src/test/java/pl/tkowalcz/thjazi/LoggingSystemTest.java
@@ -1,4 +1,4 @@
-package pl.tkowalcz.thjazi;
+package pl.tkowalcz.tjahzi;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -14,9 +14,9 @@ import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import pl.tkowalcz.thjazi.http.ClientConfiguration;
-import pl.tkowalcz.thjazi.http.HttpClientFactory;
-import pl.tkowalcz.thjazi.http.NettyHttpClient;
+import pl.tkowalcz.tjahzi.http.ClientConfiguration;
+import pl.tkowalcz.tjahzi.http.HttpClientFactory;
+import pl.tkowalcz.tjahzi.http.NettyHttpClient;
 
 import java.util.List;
 import java.util.Map;
@@ -59,7 +59,7 @@ class LoggingSystemTest {
         NettyHttpClient httpClient = HttpClientFactory.defaultFactory()
                 .getHttpClient(clientConfiguration);
 
-        ThjaziInitializer initializer = new ThjaziInitializer();
+        TjahziInitializer initializer = new TjahziInitializer();
         LoggingSystem loggingSystem = initializer.createLoggingSystem(
                 httpClient,
                 1024 * 1024,
@@ -68,7 +68,7 @@ class LoggingSystemTest {
 
         long timestamp = System.currentTimeMillis();
 
-        ThjaziLogger logger = loggingSystem.createLogger();
+        TjahziLogger logger = loggingSystem.createLogger();
         for (int i = 0; i < 1000; i++) {
             logger.log(
                     timestamp + i,
diff --git a/log4j2-appender/pom.xml b/log4j2-appender/pom.xml
index bd74d8c..41af363 100644
--- a/log4j2-appender/pom.xml
+++ b/log4j2-appender/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
-        <artifactId>thjazi</artifactId>
+        <artifactId>tjahzi</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/loki-protobuf/pom.xml b/loki-protobuf/pom.xml
index ba9e665..81a3a43 100644
--- a/loki-protobuf/pom.xml
+++ b/loki-protobuf/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>pl.tkowalcz</groupId>
-        <artifactId>thjazi</artifactId>
+        <artifactId>tjahzi</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 62c526f..7e4f58f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>pl.tkowalcz</groupId>
-    <artifactId>thjazi</artifactId>
+    <artifactId>tjahzi</artifactId>
     <packaging>pom</packaging>
 
-    <description>Thjazi is a low overhead logging client for Loki</description>
+    <description>Tjahzi is a low overhead logging client for Loki</description>
     <version>1.0-SNAPSHOT</version>
 
     <modules>
@@ -16,14 +16,14 @@
     </modules>
 
     <scm>
-        <developerConnection>scm:git:git@github.com:tkowalcz/thjazi.git</developerConnection>
-        <url>https://github.com/tkowalcz/thjazi</url>
+        <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
+        <url>https://github.com/tkowalcz/tjahzi</url>
     </scm>
 
     <licenses>
         <license>
             <name>MIT License</name>
-            <url>https://github.com/tkowalcz/thjazi/blob/master/LICENSE</url>
+            <url>https://github.com/tkowalcz/tjahzi/blob/master/LICENSE</url>
             <distribution>repo</distribution>
             <comments>A short and simple permissive license</comments>
         </license>