diff --git a/services/repository/generate.go b/services/repository/generate.go
index 9aeb057c3d..e23e294de1 100644
--- a/services/repository/generate.go
+++ b/services/repository/generate.go
@@ -43,12 +43,8 @@ type expansion struct {
 var defaultTransformers = []transformer{
 	{Name: "SNAKE", Transform: xstrings.ToSnakeCase},
 	{Name: "KEBAB", Transform: xstrings.ToKebabCase},
-	// as of xstrings v1.5.0 the CAMEL & PASCAL workarounds are no longer necessary
-	// and can be removed https://codeberg.org/forgejo/forgejo/pulls/4050
-	{Name: "CAMEL", Transform: func(str string) string {
-		return xstrings.FirstRuneToLower(xstrings.ToCamelCase(str))
-	}},
-	{Name: "PASCAL", Transform: xstrings.ToCamelCase},
+	{Name: "CAMEL", Transform: xstrings.ToCamelCase},
+	{Name: "PASCAL", Transform: xstrings.ToPascalCase},
 	{Name: "LOWER", Transform: strings.ToLower},
 	{Name: "UPPER", Transform: strings.ToUpper},
 	{Name: "TITLE", Transform: util.ToTitleCase},
diff --git a/services/repository/generate_test.go b/services/repository/generate_test.go
index b0f97d0ffb..2eb3a55e96 100644
--- a/services/repository/generate_test.go
+++ b/services/repository/generate_test.go
@@ -65,3 +65,30 @@ func TestFileNameSanitize(t *testing.T) {
 	assert.Equal(t, "_", fileNameSanitize("\u0000"))
 	assert.Equal(t, "目标", fileNameSanitize("目标"))
 }
+
+func TestTransformers(t *testing.T) {
+	input := "Foo_Forgejo-BAR"
+
+	tests := []struct {
+		name     string
+		expected string
+	}{
+		{"SNAKE", "foo_forgejo_bar"},
+		{"KEBAB", "foo-forgejo-bar"},
+		{"CAMEL", "fooForgejoBar"},
+		{"PASCAL", "FooForgejoBar"},
+		{"LOWER", "foo_forgejo-bar"},
+		{"UPPER", "FOO_FORGEJO-BAR"},
+		{"TITLE", "Foo_forgejo-Bar"},
+	}
+
+	for i, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tranform := defaultTransformers[i]
+			assert.Equal(t, tt.name, tranform.Name)
+
+			got := tranform.Transform(input)
+			assert.Equal(t, tt.expected, got)
+		})
+	}
+}