diff --git a/src/main/java/ch/njol/skript/doc/JSONGenerator.java b/src/main/java/ch/njol/skript/doc/JSONGenerator.java
index 4ef441f75d8..5563ac15642 100644
--- a/src/main/java/ch/njol/skript/doc/JSONGenerator.java
+++ b/src/main/java/ch/njol/skript/doc/JSONGenerator.java
@@ -176,12 +176,22 @@ private static JsonArray getEventValues(SkriptEventInfo<?> info) {
 						continue;
 					}
 
-					ClassInfo<?> exactClassInfo = Classes.getExactClassInfo(eventValueInfo.valueClass());
-					if (exactClassInfo == null) {
+					Class<?> valueClass = eventValueInfo.valueClass();
+					ClassInfo<?> classInfo;
+					if (valueClass.isArray()) {
+						classInfo = Classes.getExactClassInfo(valueClass.componentType());
+					} else {
+						classInfo = Classes.getExactClassInfo(valueClass);
+					}
+
+					if (classInfo == null) {
 						continue;
 					}
 
-					String name = getClassInfoName(exactClassInfo).toLowerCase(Locale.ENGLISH);
+					String name = classInfo.getName().getSingular();
+					if (valueClass.isArray()) {
+						name = classInfo.getName().getPlural();
+					}
 					if (name.isBlank()) {
 						continue;
 					}
@@ -193,8 +203,8 @@ private static JsonArray getEventValues(SkriptEventInfo<?> info) {
 					}
 
 					JsonObject object = new JsonObject();
-					object.addProperty("id", DocumentationIdProvider.getId(exactClassInfo));
-					object.addProperty("name", name);
+					object.addProperty("id", DocumentationIdProvider.getId(classInfo));
+					object.addProperty("name", name.toLowerCase(Locale.ENGLISH));
 					eventValues.add(object);
 				}
 			}
@@ -277,7 +287,7 @@ private static JsonObject generateClassInfoElement(ClassInfo<?> classInfo) {
 
 		JsonObject syntaxJsonObject = new JsonObject();
 		syntaxJsonObject.addProperty("id", DocumentationIdProvider.getId(classInfo));
-		syntaxJsonObject.addProperty("name", getClassInfoName(classInfo));
+		syntaxJsonObject.addProperty("name", Objects.requireNonNullElse(classInfo.getDocName(), classInfo.getCodeName()));
 		syntaxJsonObject.addProperty("since", classInfo.getSince());
 
 		syntaxJsonObject.add("patterns", cleanPatterns(classInfo.getUsage()));
@@ -304,16 +314,6 @@ private static JsonArray generateClassInfoArray(Iterator<ClassInfo<?>> classInfo
 		return syntaxArray;
 	}
 
-	/**
-	 * Gets either the explicitly declared documentation name or code name of a ClassInfo
-	 *
-	 * @param classInfo the ClassInfo to get the effective name of
-	 * @return the effective name of the ClassInfo
-	 */
-	private static String getClassInfoName(ClassInfo<?> classInfo) {
-		return Objects.requireNonNullElse(classInfo.getDocName(), classInfo.getCodeName());
-	}
-
 	/**
 	 * Generates the documentation JsonObject for a JavaFunction
 	 *
@@ -342,10 +342,16 @@ private static JsonObject generateFunctionElement(JavaFunction<?> function) {
 	 * @return the JsonObject representing the return type of the JavaFunction
 	 */
 	private static JsonObject getReturnType(JavaFunction<?> function) {
-		JsonObject returnType = new JsonObject();
-		returnType.addProperty("name", getClassInfoName(function.getReturnType()));
-		returnType.addProperty("id", DocumentationIdProvider.getId(function.getReturnType()));
-		return returnType;
+		JsonObject object = new JsonObject();
+
+		ClassInfo<?> returnType = function.getReturnType();
+		if (returnType == null) {
+			return null;
+		}
+
+		object.addProperty("id", DocumentationIdProvider.getId(returnType));
+		object.addProperty("name", Objects.requireNonNullElse(returnType.getDocName(), returnType.getCodeName()));
+		return object;
 	}
 
 	/**