diff --git a/Makefile b/Makefile
index 43f074b8..6fa68513 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ go-check:
 	$(eval MIN_GO_VERSION := $(shell printf "%03d%03d" $(shell echo '$(MIN_GO_VERSION_STR)' | tr '.' ' ')))
 	$(eval GO_VERSION := $(shell printf "%03d%03d" $(shell $(GO) version | grep -Eo '[0-9]+\.[0-9]+' | tr '.' ' ');))
 	@if [ "$(GO_VERSION)" -lt "$(MIN_GO_VERSION)" ]; then \
-		echo "Act Runner requires Go $(MIN_GO_VERSION_STR) or greater to build. You can get it at https://go.dev/dl/"; \
+		echo "Runner requires Go $(MIN_GO_VERSION_STR) or greater to build. You can get it at https://go.dev/dl/"; \
 		exit 1; \
 	fi
 
diff --git a/README.md b/README.md
index f504cf2b..18e1582f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-# act runner
-
-Act runner is a runner for Gitea.
+# Gitea Runner
 
 ## Installation
 
diff --git a/examples/kubernetes/dind-docker.yaml b/examples/kubernetes/dind-docker.yaml
index 2ae54bcf..b247f3d9 100644
--- a/examples/kubernetes/dind-docker.yaml
+++ b/examples/kubernetes/dind-docker.yaml
@@ -1,7 +1,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: act-runner-vol
+  name: runner-vol
 spec:
   accessModes:
     - ReadWriteOnce
@@ -25,19 +25,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: act-runner
-  name: act-runner
+    app: runner
+  name: runner
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: act-runner
+      app: runner
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        app: act-runner
+        app: runner
     spec:
       restartPolicy: Always
       volumes:
@@ -45,7 +45,7 @@ spec:
         emptyDir: {}
       - name: runner-data
         persistentVolumeClaim:
-          claimName: act-runner-vol
+          claimName: runner-vol
       containers:
       - name: runner
         image: gitea/runner:nightly
diff --git a/examples/kubernetes/rootless-docker.yaml b/examples/kubernetes/rootless-docker.yaml
index 1db4bfb1..f9678dfb 100644
--- a/examples/kubernetes/rootless-docker.yaml
+++ b/examples/kubernetes/rootless-docker.yaml
@@ -1,7 +1,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: act-runner-vol
+  name: runner-vol
 spec:
   accessModes:
     - ReadWriteOnce
@@ -25,32 +25,32 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: act-runner
-  name: act-runner
+    app: runner
+  name: runner
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: act-runner
+      app: runner
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        app: act-runner
+        app: runner
     spec:
       restartPolicy: Always
       volumes:
       - name: runner-data
         persistentVolumeClaim:
-          claimName: act-runner-vol
+          claimName: runner-vol
       securityContext:
         fsGroup: 1000
       containers:
       - name: runner
         image: gitea/runner:nightly-dind-rootless
         imagePullPolicy: Always
-        # command: ["sh", "-c", "while ! nc -z localhost 2376 </dev/null; do echo 'waiting for docker daemon...'; sleep 5; done; /sbin/tini -- /opt/act/run.sh"]
+        # command: ["sh", "-c", "while ! nc -z localhost 2376 </dev/null; do echo 'waiting for docker daemon...'; sleep 5; done; /sbin/tini -- run.sh"]
         env:
         - name: DOCKER_HOST
           value: tcp://localhost:2376
diff --git a/internal/app/cmd/cmd.go b/internal/app/cmd/cmd.go
index 018e7a93..dc485c7c 100644
--- a/internal/app/cmd/cmd.go
+++ b/internal/app/cmd/cmd.go
@@ -18,7 +18,7 @@ func Execute(ctx context.Context) {
 	// ./runner
 	rootCmd := &cobra.Command{
 		Use:          "runner [event name to run]\nIf no event name passed, will default to \"on: push\"",
-		Short:        "Run GitHub actions locally by specifying the event name (e.g. `push`) or an action name directly.",
+		Short:        "Actions runner for Gitea.",
 		Args:         cobra.MaximumNArgs(1),
 		Version:      ver.Version(),
 		SilenceUsage: true,
diff --git a/internal/pkg/config/registration.go b/internal/pkg/config/registration.go
index 414f44fe..f001cb92 100644
--- a/internal/pkg/config/registration.go
+++ b/internal/pkg/config/registration.go
@@ -8,7 +8,7 @@ import (
 	"os"
 )
 
-const registrationWarning = "This file is automatically generated by act-runner. Do not edit it manually unless you know what you are doing. Removing this file will cause act runner to re-register as a new runner."
+const registrationWarning = "This file is automatically generated by runner. Do not edit it manually unless you know what you are doing. Removing this file will cause runner to re-register as a new runner."
 
 // Registration is the registration information for a runner
 type Registration struct {
diff --git a/scripts/s6/act_runner/finish b/scripts/s6/runner/finish
similarity index 100%
rename from scripts/s6/act_runner/finish
rename to scripts/s6/runner/finish
diff --git a/scripts/s6/act_runner/run b/scripts/s6/runner/run
similarity index 100%
rename from scripts/s6/act_runner/run
rename to scripts/s6/runner/run