diff --git a/type/__jitsi_meet/manifest b/type/__jitsi_meet/manifest
index 83d9dab..ec65883 100755
--- a/type/__jitsi_meet/manifest
+++ b/type/__jitsi_meet/manifest
@@ -145,8 +145,8 @@ PROMETHEUS_JITSI_EXPORTER_VERSION_FILE="/usr/local/bin/.prometheus-jitsi-meet-ex
 if [ ! -f "${__object}/parameter/disable-prometheus-exporter" ]; then
 	case "${init}" in
 		init|sysvinit)
-			__evilham_runit
-			require="__evilham_runit" __evilham_runit_service \
+			__runit
+			require="__runit" __runit_service \
 				prometheus-jitsi-meet-exporter --log --source - <<EOF
 			#!/bin/sh -e
 			cd /tmp
@@ -156,7 +156,7 @@ if [ ! -f "${__object}/parameter/disable-prometheus-exporter" ]; then
 				-web.listen-address ':9888' 2>&1
 EOF
 
-			export require="__evilham_runit_service/prometheus-jitsi-meet-exporter"
+			export require="__runit_service/prometheus-jitsi-meet-exporter"
 			JITSI_MEET_EXPORTER_SERVICE="sv %s prometheus-jitsi-meet-exporter"
 		;;
 		systemd)
diff --git a/type/__evilham_runit/explorer/runit-etc b/type/__runit/explorer/runit-etc
similarity index 100%
rename from type/__evilham_runit/explorer/runit-etc
rename to type/__runit/explorer/runit-etc
diff --git a/type/__evilham_runit/explorer/svdir-exists b/type/__runit/explorer/svdir-exists
similarity index 100%
rename from type/__evilham_runit/explorer/svdir-exists
rename to type/__runit/explorer/svdir-exists
diff --git a/type/__evilham_runit/gencode-remote b/type/__runit/gencode-remote
similarity index 100%
rename from type/__evilham_runit/gencode-remote
rename to type/__runit/gencode-remote
diff --git a/type/__evilham_runit/man.rst b/type/__runit/man.rst
similarity index 84%
rename from type/__evilham_runit/man.rst
rename to type/__runit/man.rst
index bd1b80c..d58e143 100644
--- a/type/__evilham_runit/man.rst
+++ b/type/__runit/man.rst
@@ -1,9 +1,9 @@
-cdist-type__evilham_runit(7)
+cdist-type__runit(7)
 ============================
 
 NAME
 ----
-cdist-type__evilham_runit - Install and configure runit
+cdist-type__runit - Install and configure runit
 
 
 DESCRIPTION
@@ -28,11 +28,11 @@ EXAMPLES
 
 .. code-block:: sh
 
-    __evilham_runit
+    __runit
 
 SEE ALSO
 --------
-:strong:`cdist-type__evilham_runit_service`\ (7)
+:strong:`cdist-type__runit_service`\ (7)
 
 AUTHORS
 -------
diff --git a/type/__evilham_runit/manifest b/type/__runit/manifest
similarity index 100%
rename from type/__evilham_runit/manifest
rename to type/__runit/manifest
diff --git a/type/__evilham_runit/singleton b/type/__runit/singleton
similarity index 100%
rename from type/__evilham_runit/singleton
rename to type/__runit/singleton
diff --git a/type/__evilham_runit_service/man.rst b/type/__runit_service/man.rst
similarity index 82%
rename from type/__evilham_runit_service/man.rst
rename to type/__runit_service/man.rst
index 98bbc35..7b1db84 100644
--- a/type/__evilham_runit_service/man.rst
+++ b/type/__runit_service/man.rst
@@ -1,9 +1,9 @@
-cdist-type__evilham_runit_service(7)
+cdist-type__runit_service(7)
 ====================================
 
 NAME
 ----
-cdist-type__evilham_runit_service - Create a runit-compatible service dir.
+cdist-type__runit_service - Create a runit-compatible service dir.
 
 
 DESCRIPTION
@@ -33,7 +33,7 @@ EXAMPLES
 
 .. code-block:: sh
 
-    require="__evilham_runit" __evilham_runit_service tasksched \
+    require="__runit" __runit_service tasksched \
         --source - << EOF
     #!/bin/sh -e
     cd "${HOME}/.local/share/tasksched"
@@ -43,7 +43,7 @@ EXAMPLES
 
 SEE ALSO
 --------
-:strong:`cdist-type__evilham_runit`\ (7)
+:strong:`cdist-type__runit`\ (7)
 
 
 AUTHORS
diff --git a/type/__evilham_runit_service/manifest b/type/__runit_service/manifest
similarity index 100%
rename from type/__evilham_runit_service/manifest
rename to type/__runit_service/manifest
diff --git a/type/__evilham_runit_service/parameter/boolean b/type/__runit_service/parameter/boolean
similarity index 100%
rename from type/__evilham_runit_service/parameter/boolean
rename to type/__runit_service/parameter/boolean
diff --git a/type/__evilham_runit_service/parameter/required b/type/__runit_service/parameter/required
similarity index 100%
rename from type/__evilham_runit_service/parameter/required
rename to type/__runit_service/parameter/required