diff --git a/generate-spec b/generate-spec
index aa7f5e3..dab3d86 100755
--- a/generate-spec
+++ b/generate-spec
@@ -584,8 +584,7 @@ foreach ($routes as $route) {
 		);
 	}
 
-	$operationId = [$route->tag];
-	$operationId = array_merge($operationId, array_map(fn (string $s) => Helpers::mapVerb(strtolower($s)), Helpers::splitOnUppercaseFollowedByNonUppercase($route->methodName)));
+	$operationId = [$route->tag, ...Helpers::splitOnUppercaseFollowedByNonUppercase($route->methodName)];
 	if ($route->postfix != null) {
 		$operationId[] = $route->postfix;
 	}
@@ -605,7 +604,7 @@ foreach ($routes as $route) {
 	}
 
 	$operation = array_merge(
-		["operationId" => implode("-", $operationId)],
+		["operationId" => strtolower(implode("-", $operationId))],
 		$route->controllerMethod->summary != null ? ["summary" => $route->controllerMethod->summary] : [],
 		count($route->controllerMethod->description) > 0 ? ["description" => implode("\n", $route->controllerMethod->description)] : [],
 		$route->controllerMethod->isDeprecated ? ["deprecated" => true] : [],
diff --git a/src/Helpers.php b/src/Helpers.php
index 31cf978..f4076d1 100644
--- a/src/Helpers.php
+++ b/src/Helpers.php
@@ -50,13 +50,6 @@ public static function splitOnUppercaseFollowedByNonUppercase(string $str): arra
 		return preg_split('/(?=[A-Z][^A-Z])/', $str, -1, PREG_SPLIT_NO_EMPTY);
 	}
 
-	public static function mapVerb(string $verb): string {
-		return match ($verb) {
-			"index" => "list",
-			default => $verb,
-		};
-	}
-
 	public static function mergeSchemas(array $schemas): mixed {
 		if (!in_array(true, array_map(fn ($schema) => is_array($schema), $schemas))) {
 			$results = array_values(array_unique($schemas));