diff --git a/MockSkriptBridge/src/main/java/me/glicz/skanalyzer/bridge/MockSkriptBridgeImpl.java b/MockSkriptBridge/src/main/java/me/glicz/skanalyzer/bridge/MockSkriptBridgeImpl.java
index cb8f425..e066d3d 100644
--- a/MockSkriptBridge/src/main/java/me/glicz/skanalyzer/bridge/MockSkriptBridgeImpl.java
+++ b/MockSkriptBridge/src/main/java/me/glicz/skanalyzer/bridge/MockSkriptBridgeImpl.java
@@ -118,7 +118,7 @@ private CommandData handleCommand(StructCommand command, ScriptCommand scriptCom
                         .map(argument -> {
                             ClassInfo<?> argumentType = ReflectionUtil.getArgumentType(argument);
                             if (argumentType != null)
-                                return argumentType.getName().getSingular();
+                                return argumentType.getCodeName();
                             return null;
                         })
                         .filter(Objects::nonNull)
@@ -138,14 +138,14 @@ private EventData handleEvent(SkriptEvent event, SkriptEventInfo<?> eventInfo) {
     private FunctionData handleFunction(StructFunction function, Signature<?> signature) {
         String returnType = null;
         if (signature.getReturnType() != null)
-            returnType = signature.getReturnType().getName().getSingular();
+            returnType = signature.getReturnType().getCodeName();
 
         return new FunctionData(
                 function.getEntryContainer().getSource().getLine(),
                 signature.getName(),
                 signature.isLocal(),
                 Arrays.stream(signature.getParameters())
-                        .map(parameter -> Map.entry(parameter.getName(), parameter.getType().getName().getSingular()))
+                        .map(parameter -> Map.entry(parameter.getName(), parameter.getType().getCodeName()))
                         .collect(Collectors.toMap(
                                 Map.Entry::getKey,
                                 Map.Entry::getValue,