diff --git a/.dockerignore b/.dockerignore
index 79a0047..52f7ccb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,5 @@
 termmapper
+koralmapper
 .git
 *.tmp
 *.log
diff --git a/.gitignore b/.gitignore
index e715304..af22e44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,13 @@
 examples/
 todo.txt
 /vendor
+/koralmapper
 /termmapper
+/cmd/koralmapper/koralmapper
 /cmd/termmapper/termmapper
 *.yaml
 !/mappings/*.yaml
 \#*
 *.tar
-!/cmd/termmapper/
\ No newline at end of file
+!/cmd/termmapper/
+!/cmd/koralmapper/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 809ccb5..a9ec7a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,14 +18,14 @@
     go build -v \
     -ldflags "-extldflags '-static' -s -w" \
     --trimpath \
-    -o /src/termmapper ./cmd/termmapper/
+    -o /src/koralmapper ./cmd/koralmapper/
 
 FROM gruebel/upx:latest AS upx
 
-COPY --from=build /src/termmapper /termmapper-big
+COPY --from=build /src/koralmapper /koralmapper-big
 
 # Compress the binary and copy it to final image
-RUN upx --best --lzma -o /termmapper /termmapper-big
+RUN upx --best --lzma -o /koralmapper /koralmapper-big
 
 # Main stage
 FROM scratch AS final
@@ -36,14 +36,14 @@
 
 COPY --from=build /etc/ssl/certs /etc/ssl/certs
 COPY --from=build /src/mappings /mappings
-COPY --from=upx   /termmapper      /termmapper
+COPY --from=upx   /koralmapper      /koralmapper
 
 ENTRYPOINT [ "/termmapper" ]
 
 LABEL maintainer="korap@ids-mannheim.de"
-LABEL description="Docker Image for KoralPipe-TermMapper"
-LABEL repository="https://github.com/KorAP/KoralPipe-TermMapper"
+LABEL description="Docker Image for Koral-Mapper"
+LABEL repository="https://github.com/KorAP/Koral-Mapper"
 
-# docker build -f Dockerfile -t korap/koralpipe-termmapper:latest .
-# docker run --rm --network host korap/koralpipe-termmapper:latest -m /mappings/*.yaml
-# docker save -o korap-koralpipe-termmapper-latest.tar korap/koralpipe-termmapper:latest
\ No newline at end of file
+# docker build -f Dockerfile -t korap/koral-mapper:latest .
+# docker run --rm --network host korap/koral-mapper:latest -m /mappings/*.yaml
+# docker save -o korap-koral-mapper-latest.tar korap/koral-mapper:latest
\ No newline at end of file
diff --git a/KoralPipe-TermMapper.code-workspace b/Koral-Mapper.code-workspace
similarity index 100%
rename from KoralPipe-TermMapper.code-workspace
rename to Koral-Mapper.code-workspace
diff --git a/Makefile b/Makefile
index 6606978..0c5ed24 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-MODULE  = github.com/KorAP/KoralPipe-TermMapper
-CONFIG  = github.com/KorAP/KoralPipe-TermMapper/config
+MODULE  = github.com/KorAP/Koral-Mapper
+CONFIG  = github.com/KorAP/Koral-Mapper/config
 DEV_DIR      = $(shell pwd)
 BUILDDATE    = $(shell date -u '+%Y-%m-%d_%I:%M:%S%p')
 BUILDVERSION = $(shell git describe --tags --abbrev=0 2>/dev/null)
@@ -7,7 +7,7 @@
 
 BUILDOUT =
 ifeq ($(ACTION), build)
-  BUILDOUT = -o ./termmapper
+  BUILDOUT = -o ./koralmapper
 endif
 
 
@@ -24,7 +24,7 @@
                        -w" \
 					--trimpath \
 					$(BUILDOUT) \
-					./cmd/termmapper/
+					./cmd/koralmapper/
 
 update:	## Update all dependencies and clean up the dependency files.
 	go get -u all && go mod tidy
@@ -39,7 +39,7 @@
 	go vet ./...
 
 fuzz:
-	go test -fuzz=FuzzTransformEndpoint -fuzztime=1m ./cmd/termmapper
+	go test -fuzz=FuzzTransformEndpoint -fuzztime=1m ./cmd/koralmapper
 
 docker:
-	docker build -f Dockerfile -t korap/koralpipe-termmapper:latest .
\ No newline at end of file
+	docker build -f Dockerfile -t korap/koral-mapper:latest .
diff --git a/README.md b/README.md
index 84f1959..f78dd8e 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,21 @@
-# KoralPipe-TermMapper
+# Koral-Mapper
 
 A KorAP service using the KoralPipe mechanism to rewrite terms in queries and responses between different annotations.
 
 ## Overview
 
-KoralPipe-TermMapper is a tool for transforming linguistic annotations between different annotation schemes. It allows you to define mapping rules in YAML configuration files and apply these mappings to JSON-encoded linguistic annotations.
+Koral-Mapper is a tool for transforming linguistic annotations between different annotation schemes. It allows you to define mapping rules in YAML configuration files and apply these mappings to JSON-encoded linguistic annotations.
 
 ## Installation
 
 ```bash
-go get github.com/KorAP/KoralPipe-TermMapper
+go get github.com/KorAP/Koral-Mapper
 ```
 
 ## Usage
 
 ```bash
-termmapper -c config.yaml -m extra-mapper1.yaml -m extra-mapper2.yaml
+koralmapper -c config.yaml -m extra-mapper1.yaml -m extra-mapper2.yaml
 ```
 
 Command Line Options
@@ -30,7 +30,7 @@
 
 ## Configuration
 
-KoralPipe-TermMapper supports loading configuration from multiple sources:
+Koral-Mapper supports loading configuration from multiple sources:
 
 1. **Main Configuration File** (`-c`): Contains global settings (SDK, server endpoints, port, log level) and optional mapping lists
 2. **Individual Mapping Files** (`-m`): Contains single mapping lists, can be specified multiple times
@@ -54,8 +54,8 @@
 # Optional: Log level - debug, info, warn, error (default: warn)
 loglevel: info
 
-# Optional: ServiceURL for the termmapper
-serviceURL: "https://korap.ids-mannheim.de/plugin/termmapper"
+# Optional: ServiceURL for the koralmapper
+serviceURL: "https://korap.ids-mannheim.de/plugin/koralmapper"
 
 # Optional: Mapping lists (same format as individual mapping files)
 lists:
@@ -90,7 +90,7 @@
 - **`server`**: Custom server endpoint URL (default: `https://korap.ids-mannheim.de/`)
 - **`port`**: Server port (default: `5725`)
 - **`loglevel`**: Log level (default: `warn`)
-- **`serviceURL`**: Service URL of the TermMapper (default: `https://korap.ids-mannheim.de/plugin/termmapper`)
+- **`serviceURL`**: Service URL of the KoralMapper (default: `https://korap.ids-mannheim.de/plugin/koralmapper`)
 
 These values are applied during configuration parsing. When using only individual mapping files (`-m` flags), default values are used unless overridden by command line arguments.
 
@@ -100,9 +100,9 @@
 - Simple terms: `[key]` or `[foundry/layer=key]` or `[foundry/layer=key:value]`
 - Complex terms with AND/OR relations: `[term1 & term2]` or `[term1 | term2]` or `[term1 | (term2 & term3)]`
 
-### Foundry and Layer Precedence for TermMapping
+### Foundry and Layer Precedence for term mapping
 
-KoralPipe-TermMapper follows a strict precedence hierarchy when determining which foundry and layer values to use during mapping transformations. This ensures predictable behavior when combining mapping rules with runtime overrides.
+Koral-Mapper follows a strict precedence hierarchy when determining which foundry and layer values to use during mapping transformations. This ensures predictable behavior when combining mapping rules with runtime overrides.
 
 #### Precedence Rules
 
@@ -252,7 +252,7 @@
 Copyright (C) 2025, [IDS Mannheim](https://www.ids-mannheim.de/)<br>
 Author: [Nils Diewald](https://www.nils-diewald.de/)
 
-TermMapper is free software published under the
+Koral-Mapper is free software published under the
 [BSD-2 License](https://opensource.org/licenses/BSD-2-Clause).
 
 *Disclaimer*: This software was developed (as an experiment) with major assistance by AI (mainly Claude 3.5-sonnet and Claude 4-sonnet).
diff --git a/cmd/termmapper/fuzz_test.go b/cmd/koralmapper/fuzz_test.go
similarity index 97%
rename from cmd/termmapper/fuzz_test.go
rename to cmd/koralmapper/fuzz_test.go
index e2ac02d..39f20c3 100644
--- a/cmd/termmapper/fuzz_test.go
+++ b/cmd/koralmapper/fuzz_test.go
@@ -11,8 +11,8 @@
 	"strings"
 	"testing"
 
-	tmconfig "github.com/KorAP/KoralPipe-TermMapper/config"
-	"github.com/KorAP/KoralPipe-TermMapper/mapper"
+	tmconfig "github.com/KorAP/Koral-Mapper/config"
+	"github.com/KorAP/Koral-Mapper/mapper"
 	"github.com/gofiber/fiber/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -409,12 +409,12 @@
 }
 
 // # Run fuzzing for 1 minute
-// go test -fuzz=FuzzTransformEndpoint -fuzztime=1m ./cmd/termmapper
+// go test -fuzz=FuzzTransformEndpoint -fuzztime=1m ./cmd/koralmapper
 //
 // # Run fuzzing until a crash is found or Ctrl+C is pressed
-// go test -fuzz=FuzzTransformEndpoint ./cmd/termmapper
+// go test -fuzz=FuzzTransformEndpoint ./cmd/koralmapper
 //
 // # Run fuzzing with verbose output
-// go test -fuzz=FuzzTransformEndpoint -v ./cmd/termmapper
+// go test -fuzz=FuzzTransformEndpoint -v ./cmd/koralmapper
 //
 // go test -run=FuzzTransformEndpoint/testdata/fuzz/FuzzTransformEndpoint/$SEED
diff --git a/cmd/termmapper/main.go b/cmd/koralmapper/main.go
similarity index 98%
rename from cmd/termmapper/main.go
rename to cmd/koralmapper/main.go
index c1382cb..a998977 100644
--- a/cmd/termmapper/main.go
+++ b/cmd/koralmapper/main.go
@@ -11,8 +11,8 @@
 	"syscall"
 	"time"
 
-	"github.com/KorAP/KoralPipe-TermMapper/config"
-	"github.com/KorAP/KoralPipe-TermMapper/mapper"
+	"github.com/KorAP/Koral-Mapper/config"
+	"github.com/KorAP/Koral-Mapper/mapper"
 	"github.com/alecthomas/kong"
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/zerolog"
@@ -556,7 +556,7 @@
 
         function pluginit (p) {
           p.onMessage = function(msg) {
-            if (msg.key == 'termmapper') {
+            if (msg.key == 'koralmapper') {
               if (msg.value) {
                 qdata['job'] = 'add';
               }
diff --git a/cmd/termmapper/main_test.go b/cmd/koralmapper/main_test.go
similarity index 92%
rename from cmd/termmapper/main_test.go
rename to cmd/koralmapper/main_test.go
index 1447a15..fdd9612 100644
--- a/cmd/termmapper/main_test.go
+++ b/cmd/koralmapper/main_test.go
@@ -12,8 +12,8 @@
 	"strings"
 	"testing"
 
-	tmconfig "github.com/KorAP/KoralPipe-TermMapper/config"
-	"github.com/KorAP/KoralPipe-TermMapper/mapper"
+	tmconfig "github.com/KorAP/Koral-Mapper/config"
+	"github.com/KorAP/Koral-Mapper/mapper"
 	"github.com/gofiber/fiber/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -485,7 +485,7 @@
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 	body, err = io.ReadAll(resp.Body)
 	require.NoError(t, err)
-	assert.Contains(t, string(body), "KoralPipe-TermMapper")
+	assert.Contains(t, string(body), "Koral-Mapper")
 
 }
 
@@ -569,7 +569,7 @@
 			assert.Contains(t, htmlContent, `data-server="`+tt.expectedServer+`"`)
 
 			// Ensure it's still a valid HTML page
-			assert.Contains(t, htmlContent, "KoralPipe-TermMapper")
+			assert.Contains(t, htmlContent, "Koral-Mapper")
 			assert.Contains(t, htmlContent, "<!DOCTYPE html>")
 		})
 	}
@@ -1120,18 +1120,18 @@
 	}{
 		{
 			name:               "Custom service URL",
-			customServiceURL:   "https://custom.example.com/plugin/termmapper",
-			expectedServiceURL: "https://custom.example.com/plugin/termmapper",
+			customServiceURL:   "https://custom.example.com/plugin/koralmapper",
+			expectedServiceURL: "https://custom.example.com/plugin/koralmapper",
 		},
 		{
 			name:               "Default service URL when not specified",
 			customServiceURL:   "", // Will use default
-			expectedServiceURL: "https://korap.ids-mannheim.de/plugin/termmapper",
+			expectedServiceURL: "https://korap.ids-mannheim.de/plugin/koralmapper",
 		},
 		{
 			name:               "Custom service URL with different path",
-			customServiceURL:   "https://my-server.org/api/v1/termmapper",
-			expectedServiceURL: "https://my-server.org/api/v1/termmapper",
+			customServiceURL:   "https://my-server.org/api/v1/koralmapper",
+			expectedServiceURL: "https://my-server.org/api/v1/koralmapper",
 		},
 	}
 
@@ -1171,7 +1171,7 @@
 			assert.Contains(t, htmlContent, "'service' : '"+expectedJSURL)
 
 			// Ensure it's still a valid HTML page
-			assert.Contains(t, htmlContent, "KoralPipe-TermMapper")
+			assert.Contains(t, htmlContent, "Koral-Mapper")
 			assert.Contains(t, htmlContent, "<!DOCTYPE html>")
 		})
 	}
@@ -1182,7 +1182,7 @@
 	configContent := `
 sdk: "https://custom.example.com/sdk.js"
 server: "https://custom.example.com/"
-serviceURL: "https://custom.example.com/api/termmapper"
+serviceURL: "https://custom.example.com/api/koralmapper"
 lists:
 - id: config-mapper
   mappings:
@@ -1202,7 +1202,7 @@
 	require.NoError(t, err)
 
 	// Verify that the service URL was loaded correctly
-	assert.Equal(t, "https://custom.example.com/api/termmapper", config.ServiceURL)
+	assert.Equal(t, "https://custom.example.com/api/koralmapper", config.ServiceURL)
 
 	// Verify other fields are also preserved
 	assert.Equal(t, "https://custom.example.com/sdk.js", config.SDK)
@@ -1225,7 +1225,7 @@
 	require.NoError(t, err)
 
 	htmlContent := string(body)
-	expectedJSURL := "https://custom.example.com/api/termmapper/config-mapper/query"
+	expectedJSURL := "https://custom.example.com/api/koralmapper/config-mapper/query"
 	assert.Contains(t, htmlContent, "'service' : '"+expectedJSURL)
 }
 
@@ -1244,7 +1244,7 @@
 	tmconfig.ApplyDefaults(config)
 
 	// Check that the default service URL was applied
-	assert.Equal(t, "https://korap.ids-mannheim.de/plugin/termmapper", config.ServiceURL)
+	assert.Equal(t, "https://korap.ids-mannheim.de/plugin/koralmapper", config.ServiceURL)
 
 	// Check that other defaults were also applied
 	assert.Equal(t, "https://korap.ids-mannheim.de/", config.Server)
@@ -1261,7 +1261,7 @@
 	require.NoError(t, err)
 
 	// Verify that the default service URL was applied since it's not in the example config
-	assert.Equal(t, "https://korap.ids-mannheim.de/plugin/termmapper", config.ServiceURL)
+	assert.Equal(t, "https://korap.ids-mannheim.de/plugin/koralmapper", config.ServiceURL)
 
 	// Verify other values from the example config are preserved
 	assert.Equal(t, "https://korap.ids-mannheim.de/js/korap-plugin-latest.js", config.SDK)
@@ -1288,7 +1288,7 @@
 	require.NoError(t, err)
 
 	htmlContent := string(body)
-	expectedJSURL := "https://korap.ids-mannheim.de/plugin/termmapper/main-config-mapper/query"
+	expectedJSURL := "https://korap.ids-mannheim.de/plugin/koralmapper/main-config-mapper/query"
 	assert.Contains(t, htmlContent, "'service' : '"+expectedJSURL)
 }
 
@@ -1301,27 +1301,27 @@
 	}{
 		{
 			name:       "Service URL without trailing slash",
-			serviceURL: "https://example.com/plugin/termmapper",
+			serviceURL: "https://example.com/plugin/koralmapper",
 			mapID:      "test-mapper",
-			expected:   "'service' : 'https://example.com/plugin/termmapper/test-mapper/query",
+			expected:   "'service' : 'https://example.com/plugin/koralmapper/test-mapper/query",
 		},
 		{
 			name:       "Service URL with trailing slash",
-			serviceURL: "https://example.com/plugin/termmapper/",
+			serviceURL: "https://example.com/plugin/koralmapper/",
 			mapID:      "test-mapper",
-			expected:   "'service' : 'https://example.com/plugin/termmapper/test-mapper/query",
+			expected:   "'service' : 'https://example.com/plugin/koralmapper/test-mapper/query",
 		},
 		{
 			name:       "Map ID with leading slash",
-			serviceURL: "https://example.com/plugin/termmapper",
+			serviceURL: "https://example.com/plugin/koralmapper",
 			mapID:      "/test-mapper",
-			expected:   "'service' : 'https://example.com/plugin/termmapper/test-mapper/query",
+			expected:   "'service' : 'https://example.com/plugin/koralmapper/test-mapper/query",
 		},
 		{
 			name:       "Both with slashes",
-			serviceURL: "https://example.com/plugin/termmapper/",
+			serviceURL: "https://example.com/plugin/koralmapper/",
 			mapID:      "/test-mapper",
-			expected:   "'service' : 'https://example.com/plugin/termmapper/test-mapper/query",
+			expected:   "'service' : 'https://example.com/plugin/koralmapper/test-mapper/query",
 		},
 		{
 			name:       "Complex map ID",
@@ -1376,7 +1376,7 @@
 
 	// Create mock config
 	mockConfig := &tmconfig.MappingConfig{
-		ServiceURL: "https://example.com/plugin/termmapper",
+		ServiceURL: "https://example.com/plugin/koralmapper",
 		Lists:      []tmconfig.MappingList{mappingList},
 	}
 
@@ -1398,43 +1398,43 @@
 		{
 			name:             "Default parameters (no query params)",
 			url:              "/test-mapper",
-			expectedQueryURL: "https://example.com/plugin/termmapper/test-mapper/query?dir=atob",
-			expectedRespURL:  "https://example.com/plugin/termmapper/test-mapper/response?dir=btoa",
+			expectedQueryURL: "https://example.com/plugin/koralmapper/test-mapper/query?dir=atob",
+			expectedRespURL:  "https://example.com/plugin/koralmapper/test-mapper/response?dir=btoa",
 			expectedStatus:   http.StatusOK,
 		},
 		{
 			name:             "Explicit dir=atob",
 			url:              "/test-mapper?dir=atob",
-			expectedQueryURL: "https://example.com/plugin/termmapper/test-mapper/query?dir=atob",
-			expectedRespURL:  "https://example.com/plugin/termmapper/test-mapper/response?dir=btoa",
+			expectedQueryURL: "https://example.com/plugin/koralmapper/test-mapper/query?dir=atob",
+			expectedRespURL:  "https://example.com/plugin/koralmapper/test-mapper/response?dir=btoa",
 			expectedStatus:   http.StatusOK,
 		},
 		{
 			name:             "Explicit dir=btoa",
 			url:              "/test-mapper?dir=btoa",
-			expectedQueryURL: "https://example.com/plugin/termmapper/test-mapper/query?dir=btoa",
-			expectedRespURL:  "https://example.com/plugin/termmapper/test-mapper/response?dir=atob",
+			expectedQueryURL: "https://example.com/plugin/koralmapper/test-mapper/query?dir=btoa",
+			expectedRespURL:  "https://example.com/plugin/koralmapper/test-mapper/response?dir=atob",
 			expectedStatus:   http.StatusOK,
 		},
 		{
 			name:             "With foundry parameters",
 			url:              "/test-mapper?dir=atob&foundryA=opennlp&foundryB=upos",
-			expectedQueryURL: "https://example.com/plugin/termmapper/test-mapper/query?dir=atob&foundryA=opennlp&foundryB=upos",
-			expectedRespURL:  "https://example.com/plugin/termmapper/test-mapper/response?dir=btoa&foundryA=opennlp&foundryB=upos",
+			expectedQueryURL: "https://example.com/plugin/koralmapper/test-mapper/query?dir=atob&foundryA=opennlp&foundryB=upos",
+			expectedRespURL:  "https://example.com/plugin/koralmapper/test-mapper/response?dir=btoa&foundryA=opennlp&foundryB=upos",
 			expectedStatus:   http.StatusOK,
 		},
 		{
 			name:             "With layer parameters",
 			url:              "/test-mapper?dir=btoa&layerA=pos&layerB=upos",
-			expectedQueryURL: "https://example.com/plugin/termmapper/test-mapper/query?dir=btoa&layerA=pos&layerB=upos",
-			expectedRespURL:  "https://example.com/plugin/termmapper/test-mapper/response?dir=atob&layerA=pos&layerB=upos",
+			expectedQueryURL: "https://example.com/plugin/koralmapper/test-mapper/query?dir=btoa&layerA=pos&layerB=upos",
+			expectedRespURL:  "https://example.com/plugin/koralmapper/test-mapper/response?dir=atob&layerA=pos&layerB=upos",
 			expectedStatus:   http.StatusOK,
 		},
 		{
 			name:             "All parameters",
 			url:              "/test-mapper?dir=atob&foundryA=opennlp&foundryB=upos&layerA=pos&layerB=upos",
-			expectedQueryURL: "https://example.com/plugin/termmapper/test-mapper/query?dir=atob&foundryA=opennlp&foundryB=upos&layerA=pos&layerB=upos",
-			expectedRespURL:  "https://example.com/plugin/termmapper/test-mapper/response?dir=btoa&foundryA=opennlp&foundryB=upos&layerA=pos&layerB=upos",
+			expectedQueryURL: "https://example.com/plugin/koralmapper/test-mapper/query?dir=atob&foundryA=opennlp&foundryB=upos&layerA=pos&layerB=upos",
+			expectedRespURL:  "https://example.com/plugin/koralmapper/test-mapper/response?dir=btoa&foundryA=opennlp&foundryB=upos&layerA=pos&layerB=upos",
 			expectedStatus:   http.StatusOK,
 		},
 		{
@@ -1483,7 +1483,7 @@
 				assert.Contains(t, htmlContent, "'service' : '"+tt.expectedRespURL+"'")
 
 				// Ensure it's still a valid HTML page
-				assert.Contains(t, htmlContent, "KoralPipe-TermMapper")
+				assert.Contains(t, htmlContent, "Koral-Mapper")
 				assert.Contains(t, htmlContent, "<!DOCTYPE html>")
 			}
 		})
diff --git a/config/config.go b/config/config.go
index b9c2678..d245461 100644
--- a/config/config.go
+++ b/config/config.go
@@ -4,8 +4,8 @@
 	"fmt"
 	"os"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
-	"github.com/KorAP/KoralPipe-TermMapper/parser"
+	"github.com/KorAP/Koral-Mapper/ast"
+	"github.com/KorAP/Koral-Mapper/parser"
 	"github.com/rs/zerolog/log"
 	"gopkg.in/yaml.v3"
 )
@@ -13,7 +13,7 @@
 const (
 	defaultServer     = "https://korap.ids-mannheim.de/"
 	defaultSDK        = "https://korap.ids-mannheim.de/js/korap-plugin-latest.js"
-	defaultServiceURL = "https://korap.ids-mannheim.de/plugin/termmapper"
+	defaultServiceURL = "https://korap.ids-mannheim.de/plugin/koralmapper"
 	defaultPort       = 5725
 	defaultLogLevel   = "warn"
 )
diff --git a/config/config_test.go b/config/config_test.go
index 44c2fbc..cc14416 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -5,7 +5,7 @@
 	"os"
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 	"github.com/rs/zerolog/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/config/version.go b/config/version.go
index 3cc61c9..c86721f 100644
--- a/config/version.go
+++ b/config/version.go
@@ -3,10 +3,10 @@
 const (
 
 	// Title represents the name of this tool.
-	Title string = "KoralPipe-TermMapper"
+	Title string = "Koral-Mapper"
 
 	// Description represents a short description of this tool.
-	Description string = "A KoralPipe web service for transforming JSON objects using term mapping rules."
+	Description string = "A KoralPipe web service for transforming JSON objects using mapping rules."
 )
 
 // Version represents the SemVer of the server.
diff --git a/go.mod b/go.mod
index 1a51b70..4dd3711 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/KorAP/KoralPipe-TermMapper
+module github.com/KorAP/Koral-Mapper
 
 go 1.23.0
 
diff --git a/mapper/benchmark_test.go b/mapper/benchmark_test.go
index 0e7cccb..6338661 100644
--- a/mapper/benchmark_test.go
+++ b/mapper/benchmark_test.go
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/config"
+	"github.com/KorAP/Koral-Mapper/config"
 )
 
 // BenchmarkApplyQueryMappings benchmarks the optimized ApplyQueryMappings method
diff --git a/mapper/mapper.go b/mapper/mapper.go
index fe46a83..d11ae01 100644
--- a/mapper/mapper.go
+++ b/mapper/mapper.go
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 
-	"github.com/KorAP/KoralPipe-TermMapper/config"
-	"github.com/KorAP/KoralPipe-TermMapper/parser"
+	"github.com/KorAP/Koral-Mapper/config"
+	"github.com/KorAP/Koral-Mapper/parser"
 )
 
 // Direction represents the mapping direction (A to B or B to A)
diff --git a/mapper/mapper_test.go b/mapper/mapper_test.go
index a15d69b..c561663 100644
--- a/mapper/mapper_test.go
+++ b/mapper/mapper_test.go
@@ -4,9 +4,9 @@
 	"encoding/json"
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
-	"github.com/KorAP/KoralPipe-TermMapper/config"
-	"github.com/KorAP/KoralPipe-TermMapper/matcher"
+	"github.com/KorAP/Koral-Mapper/ast"
+	"github.com/KorAP/Koral-Mapper/config"
+	"github.com/KorAP/Koral-Mapper/matcher"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/mapper/query.go b/mapper/query.go
index 0bc7d7e..73bc880 100644
--- a/mapper/query.go
+++ b/mapper/query.go
@@ -4,9 +4,9 @@
 	"encoding/json"
 	"fmt"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
-	"github.com/KorAP/KoralPipe-TermMapper/matcher"
-	"github.com/KorAP/KoralPipe-TermMapper/parser"
+	"github.com/KorAP/Koral-Mapper/ast"
+	"github.com/KorAP/Koral-Mapper/matcher"
+	"github.com/KorAP/Koral-Mapper/parser"
 )
 
 // ApplyQueryMappings applies the specified mapping rules to a JSON object
diff --git a/mapper/response.go b/mapper/response.go
index e89d12a..d756edc 100644
--- a/mapper/response.go
+++ b/mapper/response.go
@@ -4,9 +4,9 @@
 	"fmt"
 	"strings"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
-	"github.com/KorAP/KoralPipe-TermMapper/matcher"
-	"github.com/KorAP/KoralPipe-TermMapper/parser"
+	"github.com/KorAP/Koral-Mapper/ast"
+	"github.com/KorAP/Koral-Mapper/matcher"
+	"github.com/KorAP/Koral-Mapper/parser"
 	"github.com/rs/zerolog/log"
 )
 
diff --git a/mapper/response_test.go b/mapper/response_test.go
index 566f235..dadba6c 100644
--- a/mapper/response_test.go
+++ b/mapper/response_test.go
@@ -4,7 +4,7 @@
 	"encoding/json"
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/config"
+	"github.com/KorAP/Koral-Mapper/config"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/matcher/matcher.go b/matcher/matcher.go
index bf5aaa5..b2fb613 100644
--- a/matcher/matcher.go
+++ b/matcher/matcher.go
@@ -3,7 +3,7 @@
 import (
 	"fmt"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 )
 
 // Matcher handles pattern matching and replacement in the AST
diff --git a/matcher/matcher_test.go b/matcher/matcher_test.go
index 994334c..53d7765 100644
--- a/matcher/matcher_test.go
+++ b/matcher/matcher_test.go
@@ -7,7 +7,7 @@
 	"encoding/json"
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/matcher/snippet_matcher.go b/matcher/snippet_matcher.go
index 0e40c78..fe664a6 100644
--- a/matcher/snippet_matcher.go
+++ b/matcher/snippet_matcher.go
@@ -5,8 +5,8 @@
 	"sort"
 	"strings"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
-	"github.com/KorAP/KoralPipe-TermMapper/parser"
+	"github.com/KorAP/Koral-Mapper/ast"
+	"github.com/KorAP/Koral-Mapper/parser"
 	"github.com/orisano/gosax"
 )
 
diff --git a/matcher/snippet_matcher_test.go b/matcher/snippet_matcher_test.go
index 5c9b852..3142f9f 100644
--- a/matcher/snippet_matcher_test.go
+++ b/matcher/snippet_matcher_test.go
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/parser/grammar_parser.go b/parser/grammar_parser.go
index 4862cea..7c949f8 100644
--- a/parser/grammar_parser.go
+++ b/parser/grammar_parser.go
@@ -4,7 +4,7 @@
 	"fmt"
 	"strings"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 	"github.com/alecthomas/participle/v2"
 	"github.com/alecthomas/participle/v2/lexer"
 )
diff --git a/parser/grammar_parser_test.go b/parser/grammar_parser_test.go
index 07f61e9..ac0cabf 100644
--- a/parser/grammar_parser_test.go
+++ b/parser/grammar_parser_test.go
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/parser/parser.go b/parser/parser.go
index e122edc..a6f29f9 100644
--- a/parser/parser.go
+++ b/parser/parser.go
@@ -10,7 +10,7 @@
 
 	"maps"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 )
 
 // rawNode represents the raw JSON structure
diff --git a/parser/parser_test.go b/parser/parser_test.go
index 424743d..d84b802 100644
--- a/parser/parser_test.go
+++ b/parser/parser_test.go
@@ -4,7 +4,7 @@
 	"encoding/json"
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/parser/title_parser.go b/parser/title_parser.go
index 87bd809..053ba59 100644
--- a/parser/title_parser.go
+++ b/parser/title_parser.go
@@ -4,7 +4,7 @@
 	"fmt"
 	"regexp"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 )
 
 // TitleAttribute represents a parsed title attribute from an HTML span
diff --git a/parser/title_parser_test.go b/parser/title_parser_test.go
index 1a74905..343c98e 100644
--- a/parser/title_parser_test.go
+++ b/parser/title_parser_test.go
@@ -3,7 +3,7 @@
 import (
 	"testing"
 
-	"github.com/KorAP/KoralPipe-TermMapper/ast"
+	"github.com/KorAP/Koral-Mapper/ast"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )