From 99c4a8646a4f2132758ecb607b86582c08bc6d35 Mon Sep 17 00:00:00 2001
From: ShaneBeee <shanebolenback@me.com>
Date: Wed, 11 Feb 2026 08:29:59 -0800
Subject: [PATCH 1/5] TriggerMap - memory leak - variables should be cleared
 after EACH trigger is called, not after all of them are called

---
 .../io/github/syst3ms/skriptparser/lang/TriggerMap.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/TriggerMap.java b/src/main/java/io/github/syst3ms/skriptparser/lang/TriggerMap.java
index c06047eb..e3f6b1bb 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/TriggerMap.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/TriggerMap.java
@@ -77,8 +77,11 @@ public static <T extends TriggerContext> List<Trigger> getTriggersByContext(Clas
      * @param <T>     Trigger context type
      */
     public static <T extends TriggerContext> void callTriggersByContext(T context) {
-        getTriggersByContext(context.getClass()).forEach(t -> Statement.runAll(t, context));
-        Variables.clearLocalVariables(context);
+        getTriggersByContext(context.getClass()).forEach(t -> {
+            Statement.runAll(t, context);
+            Variables.clearLocalVariables(context);
+        });
+
     }
 
 }

From 92af2f629d693dfc738a1e45330925a58f7d061d Mon Sep 17 00:00:00 2001
From: ShaneBeee <shanebolenback@me.com>
Date: Wed, 11 Feb 2026 14:18:10 -0800
Subject: [PATCH 2/5] Statement - add exceptionHandler (going to use this to
 catch them in tests)

---
 .../io/github/syst3ms/skriptparser/lang/Statement.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/Statement.java b/src/main/java/io/github/syst3ms/skriptparser/lang/Statement.java
index c73e26d3..b432928d 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/Statement.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/Statement.java
@@ -13,6 +13,7 @@
  */
 public abstract class Statement implements SyntaxElement {
     public static Consumer<IllegalStateException> illegalStateRunnable;
+    public static Consumer<Exception> exceptionHandler;
     @Nullable
     protected CodeSection parent;
     @Nullable
@@ -22,6 +23,10 @@ public static void setIllegalStateHandler(Consumer<IllegalStateException> consum
         Statement.illegalStateRunnable = consumer;
     }
 
+    public static void setExceptionHandler(Consumer<Exception> consumer) {
+        Statement.exceptionHandler = consumer;
+    }
+
     /**
      * Runs all code starting at a given point sequentially.
      * Do note this will not clear local variables after running.
@@ -48,8 +53,12 @@ public static boolean runAll(Statement start, TriggerContext context) {
             }
             return false;
         } catch (Exception e) {
+            if (exceptionHandler != null) {
+                exceptionHandler.accept(e);
+            }
             System.err.println("An exception occurred. Stack trace:");
             e.printStackTrace();
+
         }
         return false;
     }

From fdb23edfee3e942021e960e4d7de6f7316ab174e Mon Sep 17 00:00:00 2001
From: ShaneBeee <shanebolenback@me.com>
Date: Wed, 11 Feb 2026 16:44:06 -0800
Subject: [PATCH 3/5] VariableString - fix Type#variableNameFunc being applied
 to ALL strings

---
 .../skriptparser/lang/VariableString.java       | 17 ++++++++++-------
 .../skriptparser/variables/Variables.java       |  3 ++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/VariableString.java b/src/main/java/io/github/syst3ms/skriptparser/lang/VariableString.java
index 4c2072de..a6dcadd1 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/VariableString.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/VariableString.java
@@ -8,6 +8,7 @@
 import io.github.syst3ms.skriptparser.registration.tags.Tag;
 import io.github.syst3ms.skriptparser.registration.tags.TagManager;
 import io.github.syst3ms.skriptparser.types.TypeManager;
+import io.github.syst3ms.skriptparser.types.TypeManager.StringMode;
 import io.github.syst3ms.skriptparser.util.CollectionUtils;
 import io.github.syst3ms.skriptparser.util.StringUtils;
 import org.jetbrains.annotations.Contract;
@@ -27,10 +28,12 @@ public class VariableString extends TaggedExpression {
      */
     private final Object[] data;
     private final boolean simple;
+    private final StringMode stringMode;
 
-    private VariableString(Object[] data) {
+    private VariableString(Object[] data, StringMode stringMode) {
         this.data = data;
         this.simple = data.length == 1 && data[0] instanceof String;
+        this.stringMode = stringMode;
     }
 
     /**
@@ -41,7 +44,7 @@ private VariableString(Object[] data) {
      * @return {@code null} if either:
      * <ul>
      *     <li>The argument isn't quoted correctly</li>
-     *     <li>{@link #newInstance(String, ParserState, SkriptLogger)} returned null, which can happen when the string literal is of the form
+     *     <li>{@link #newInstance(String, ParserState, SkriptLogger, StringMode)} returned null, which can happen when the string literal is of the form
      *     {@code "..."}</li>
      *     <li>Something went very wrong when parsing a raw literal {@code R"possible delimiter(...)possible delimiter'}
      *     </li>
@@ -49,11 +52,11 @@ private VariableString(Object[] data) {
      */
     public static Optional<VariableString> newInstanceWithQuotes(String s, ParserState parserState, SkriptLogger logger) {
         if (s.startsWith("\"") && s.endsWith("\"") && StringUtils.nextSimpleCharacterIndex(s, 0) == s.length()) {
-            return newInstance(s.substring(1, s.length() - 1), parserState, logger);
+            return newInstance(s.substring(1, s.length() - 1), parserState, logger, StringMode.STRING);
         } else if (s.startsWith("'") && s.endsWith("'") && StringUtils.nextSimpleCharacterIndex(s, 0) == s.length()) {
             return Optional.of(new VariableString(new String[]{
                 s.substring(1, s.length() - 1).replace("\\\"", "\"")
-            }));
+            }, StringMode.STRING));
         }
         return Optional.empty();
     }
@@ -66,7 +69,7 @@ public static Optional<VariableString> newInstanceWithQuotes(String s, ParserSta
      * @param logger      the logger
      * @return a new instance of a VariableString, or {@code null} if there are unbalanced {@literal %} symbols
      */
-    public static Optional<VariableString> newInstance(String s, ParserState parserState, SkriptLogger logger) {
+    public static Optional<VariableString> newInstance(String s, ParserState parserState, SkriptLogger logger, StringMode stringMode) {
         List<Object> data = new ArrayList<>(StringUtils.count(s, "%"));
         var sb = new StringBuilder();
         var charArray = s.toCharArray();
@@ -162,7 +165,7 @@ public static Optional<VariableString> newInstance(String s, ParserState parserS
         if (sb.length() > 0) {
             data.add(sb.toString());
         }
-        return Optional.of(new VariableString(data.toArray()));
+        return Optional.of(new VariableString(data.toArray(), stringMode));
     }
 
     @Override
@@ -200,7 +203,7 @@ public String toString(TriggerContext ctx, String tagCtx) {
         for (int i = 0; i < actualData.length; i++) {
             var o = actualData[i];
             if (o instanceof Expression) {
-                sb.append(TypeManager.toString(((Expression<?>) o).getValues(ctx), TypeManager.StringMode.VARIABLE));
+                sb.append(TypeManager.toString(((Expression<?>) o).getValues(ctx), this.stringMode));
             } else if (o instanceof Tag) {
                 ongoingTags.add((Tag) o);
                 int indexOfNext = CollectionUtils.ordinalConditionalIndexOf(actualData, ++currentTags, t -> t instanceof Tag);
diff --git a/src/main/java/io/github/syst3ms/skriptparser/variables/Variables.java b/src/main/java/io/github/syst3ms/skriptparser/variables/Variables.java
index 46184665..5a6d5963 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/variables/Variables.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/variables/Variables.java
@@ -8,6 +8,7 @@
 import io.github.syst3ms.skriptparser.log.ErrorType;
 import io.github.syst3ms.skriptparser.log.SkriptLogger;
 import io.github.syst3ms.skriptparser.parsing.ParserState;
+import io.github.syst3ms.skriptparser.types.TypeManager.StringMode;
 import io.github.syst3ms.skriptparser.util.MultiMap;
 import org.jetbrains.annotations.Nullable;
 
@@ -153,7 +154,7 @@ public static <T> Optional<? extends Expression<T>> parseVariable(String input,
         var vs = VariableString.newInstance(
             input.startsWith(LOCAL_VARIABLE_TOKEN) ? input.substring(LOCAL_VARIABLE_TOKEN.length()).strip() : input,
             parserState,
-            logger
+            logger, StringMode.VARIABLE
         );
         var finalS = input;
         return vs.map(v -> new Variable<>(v, finalS.startsWith(LOCAL_VARIABLE_TOKEN), finalS.endsWith(LIST_SEPARATOR + "*"), types));

From 9d899452f9bd59449d2aede83b9edcbeb53ba44b Mon Sep 17 00:00:00 2001
From: ShaneBeee <shanebolenback@me.com>
Date: Thu, 12 Feb 2026 09:49:32 -0800
Subject: [PATCH 4/5] SkriptDate/Time - add setter for formats - this way we
 can change this via config

---
 .../io/github/syst3ms/skriptparser/util/SkriptDate.java    | 7 +++++--
 .../java/io/github/syst3ms/skriptparser/util/Time.java     | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/SkriptDate.java b/src/main/java/io/github/syst3ms/skriptparser/util/SkriptDate.java
index 0611312e..809e81da 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/SkriptDate.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/SkriptDate.java
@@ -12,8 +12,7 @@
 import java.util.TimeZone;
 
 public class SkriptDate implements Comparable<SkriptDate> {
-    // TODO make a config for this
-    public final static String DATE_FORMAT = "EEEE dd MMMM yyyy HH:mm:ss.SSS"; // Add 'zzzXXX' to display time zone as well
+    public static String DATE_FORMAT = "EEEE dd MMMM yyyy HH:mm:ss.SSS"; // Add 'zzzXXX' to display time zone as well
     public final static Locale DATE_LOCALE = Locale.US;
 
     private static final TimeZone defaultTimeZone = TimeZone.getDefault();
@@ -93,6 +92,10 @@ public static TimeZone getDefaultTimeZone() {
         return defaultTimeZone;
     }
 
+    public static void setDefaultDateFormat(String format) {
+        DATE_FORMAT = format;
+    }
+
     /**
      * @return the amount of milliseconds that have passed
      * since midnight, January 1st, 1970 in the UTC time zone
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/Time.java b/src/main/java/io/github/syst3ms/skriptparser/util/Time.java
index 40bb1d01..834b6d4d 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/Time.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/Time.java
@@ -15,8 +15,7 @@
  * @author Mwexim
  */
 public class Time implements Comparable<Time> {
-    // TODO make a config for this
-    public final static String TIME_FORMAT = "HH:mm:ss.SSS";
+    public static String TIME_FORMAT = "HH:mm:ss.SSS";
     public final static Locale TIME_LOCALE = Locale.US;
 
     /**
@@ -85,6 +84,10 @@ public static Time of(SkriptDate date) {
         return new Time(lcd.toLocalTime());
     }
 
+    public static void setDefaultTimeFormat(String format) {
+        TIME_FORMAT = format;
+    }
+
     /**
      * Parses a given string as a time, using one of the three patterns.
      *

From d5c36394f35aae5b986445707831e775a1d5337a Mon Sep 17 00:00:00 2001
From: ShaneBeee <shanebolenback@me.com>
Date: Thu, 12 Feb 2026 19:21:16 -0800
Subject: [PATCH 5/5] Fix a mistake I made with first/second

---
 .../skriptparser/effects/EffEscape.java       |   2 +-
 .../expressions/CondExprCompare.java          |   2 +-
 .../expressions/ExecExprListOperators.java    |  10 +-
 .../expressions/ExecExprReplace.java          |  10 +-
 .../skriptparser/expressions/ExprAmount.java  |   2 +-
 .../expressions/ExprDateInformation.java      |   6 +-
 .../expressions/ExprDefaultValue.java         |   4 +-
 .../expressions/ExprDurationSinceUntil.java   |   4 +-
 .../skriptparser/expressions/ExprElement.java |   8 +-
 .../expressions/ExprLoopValue.java            |   2 +-
 .../expressions/ExprStringOccurrence.java     |  10 +-
 .../expressions/ExprSubstring.java            |   6 +-
 .../skriptparser/expressions/ExprTernary.java |   2 +-
 .../syst3ms/skriptparser/file/FileParser.java |   2 +-
 .../skriptparser/lang/CodeSection.java        |   2 +-
 .../syst3ms/skriptparser/lang/Statement.java  |   2 +-
 .../syst3ms/skriptparser/lang/Variable.java   |   2 +-
 .../skriptparser/lang/control/Finishing.java  |   2 +-
 .../skriptparser/lang/event/SkriptEvent.java  |   2 +-
 .../lang/lambda/ArgumentSection.java          |   2 +-
 .../lang/lambda/SectionValue.java             |   2 +-
 .../skriptparser/parsing/ParserState.java     |   2 +-
 .../skriptparser/parsing/SyntaxParser.java    |   2 +-
 .../pattern/ExpressionElement.java            |   2 +-
 .../skriptparser/pattern/PatternElement.java  |   2 +-
 .../skriptparser/pattern/PatternParser.java   |   4 +-
 .../skriptparser/pattern/TextElement.java     |   2 +-
 .../skriptparser/sections/SecSwitch.java      |   2 +-
 .../functions/DefaultFunctions.java           |   2 +-
 .../types/changers/Arithmetic.java            |   4 +-
 .../types/comparisons/Comparator.java         |   8 +-
 .../types/comparisons/ComparatorInfo.java     |   4 +-
 .../types/comparisons/Comparators.java        |   4 +-
 .../types/comparisons/InverseComparator.java  |   4 +-
 .../types/comparisons/Relation.java           |   8 +-
 .../types/conversions/ChainedConverter.java   |   2 +-
 .../types/conversions/Converters.java         |   4 +-
 .../skriptparser/util/DoubleOptional.java     | 102 +++++++++---------
 .../skriptparser/util/DurationUtils.java      |   2 +-
 .../syst3ms/skriptparser/util/FileUtils.java  |   2 +-
 .../syst3ms/skriptparser/util/Pair.java       |  12 +--
 .../skriptparser/util/RecentElementList.java  |   2 +-
 .../skriptparser/util/StringUtils.java        |   8 +-
 .../skriptparser/util/math/NumberMath.java    |   2 +-
 .../skriptparser/util/math/PowerIterator.java |   2 +-
 .../util/math/SeriesCalculator.java           |   2 +-
 .../variables/VariableStorage.java            |   2 +-
 47 files changed, 138 insertions(+), 138 deletions(-)

diff --git a/src/main/java/io/github/syst3ms/skriptparser/effects/EffEscape.java b/src/main/java/io/github/syst3ms/skriptparser/effects/EffEscape.java
index 8dd7b33b..b8a9d313 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/effects/EffEscape.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/effects/EffEscape.java
@@ -63,7 +63,7 @@ public Optional<? extends Statement> walk(TriggerContext ctx) {
                 ? ((SelfReferencing) val).getActualNext()
                 : val.getNext());
 
-            // Because otherwise SelfReferencing sections will getFirst reference to themselves
+            // Because otherwise SelfReferencing sections will first reference to themselves
             if (current.filter(val -> val instanceof Finishing).isEmpty())
                 am--;
         }
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/CondExprCompare.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/CondExprCompare.java
index 9bf39f86..cdbfde27 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/CondExprCompare.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/CondExprCompare.java
@@ -133,7 +133,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, ParseContex
                 || firstEach && first.isSingle() != second.isSingle()
                 || second.isSingle() != third.isSingle())) {
                 /*
-                 * What is ruled out here is using "each" when "getSecond" and "third" don't match in number or in and/or type.
+                 * What is ruled out here is using "each" when "second" and "third" don't match in number or in and/or type.
                  * Otherwise these are fundamentally the same checks as above but when "third" is present.
                  */
                 logger.error(
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExecExprListOperators.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExecExprListOperators.java
index 86404bc0..e6a887c0 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExecExprListOperators.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExecExprListOperators.java
@@ -16,8 +16,8 @@
  * Basic list operators that return the following elements:
  * <ul>
  *      <li>{@code pop}: the last element</li>
- *      <li>{@code shift/poll}: the getFirst element</li>
- *      <li>{@code extract}: a specific (or just the getFirst/last) element</li>
+ *      <li>{@code shift/poll}: the first element</li>
+ *      <li>{@code extract}: a specific (or just the first/last) element</li>
  *      <li>{@code splice}: elements in a certain bound</li>
  * </ul>
  * However, this syntax can also be used as an effect. If this is the case, instead of returning
@@ -32,7 +32,7 @@
  * @author Mwexim
  * @name List Operators
  * @type EFFECT/EXPRESSION
- * @pattern extract [the] (last|getFirst|%integer%(st|nd|rd|th)) element out [of] %objects%
+ * @pattern extract [the] (last|first|%integer%(st|nd|rd|th)) element out [of] %objects%
  * @pattern pop %objects%
  * @pattern (shift | poll) %objects%
  * @pattern splice %objects% (from %integer% to %integer%|starting (at|from) %integer%|up to %integer%) [[with] step %integer%]
@@ -45,14 +45,14 @@ public class ExecExprListOperators extends ExecutableExpression<Object> {
             ExecExprListOperators.class,
             Object.class,
             false,
-            "extract [the] (0:last|1:getFirst|2:%integer%(st|nd|rd|th)) element out [of] %objects%",
+            "extract [the] (0:last|1:first|2:%integer%(st|nd|rd|th)) element out [of] %objects%",
             "pop %objects%",
             "(shift|poll) %objects%",
             "splice %objects% (0:from %integer% to %integer%|1:starting (at|from) %integer%|2:up to %integer%) [[with] step %integer%]"
         );
     }
 
-    // 0 = last, 1 = getFirst, 2 = indexed, 3 = spliced
+    // 0 = last, 1 = first, 2 = indexed, 3 = spliced
     private int type;
     private Expression<Object> list;
     private Expression<Integer> index;
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExecExprReplace.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExecExprReplace.java
index 1d7463c0..c01b0440 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExecExprReplace.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExecExprReplace.java
@@ -23,8 +23,8 @@
  * @author Mwexim
  * @name Replace
  * @type EFFECT/EXPRESSION
- * @pattern replace [(all|every|[the] getFirst|[the] last)] [regex [pattern[s]]] %strings% in %strings% with %string%
- * @pattern replace [(all|every|[the] getFirst|[the] last)] [regex [pattern[s]]] %strings% with %string% in %strings%
+ * @pattern replace [(all|every|[the] first|[the] last)] [regex [pattern[s]]] %strings% in %strings% with %string%
+ * @pattern replace [(all|every|[the] first|[the] last)] [regex [pattern[s]]] %strings% with %string% in %strings%
  * @see ExprElement
  * @since ALPHA
  */
@@ -32,8 +32,8 @@ public class ExecExprReplace extends ExecutableExpression<String> {
     static {
         // TODO add "new" so we can add docs
         Parser.getMainRegistration().addExecutableExpression(ExecExprReplace.class, String.class, false,
-            "replace [(0:all|0:every|1:[the] getFirst|2:[the] last)] [:regex [pattern[s]]] %strings% in %strings% with %string%",
-            "replace [(0:all|0:every|1:[the] getFirst|2:[the] last)] [:regex [pattern[s]]] %strings% with %string% in %strings%"
+            "replace [(0:all|0:every|1:[the] first|2:[the] last)] [:regex [pattern[s]]] %strings% in %strings% with %string%",
+            "replace [(0:all|0:every|1:[the] first|2:[the] last)] [:regex [pattern[s]]] %strings% with %string% in %strings%"
         );
     }
 
@@ -136,7 +136,7 @@ public String[] getValues(TriggerContext ctx, boolean isEffect) {
     @Override
     public String toString(TriggerContext ctx, boolean debug) {
         return "replace "
-            + new String[]{"all ", "getFirst ", "last "}[type] + toMatch.toString(ctx, debug)
+            + new String[]{"all ", "first ", "last "}[type] + toMatch.toString(ctx, debug)
             + " in " + toReplace.toString(ctx, debug)
             + " with " + replacement.toString(ctx, debug);
     }
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprAmount.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprAmount.java
index 3710bd10..be72184d 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprAmount.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprAmount.java
@@ -13,7 +13,7 @@
 
 /**
  * The amount of elements in a given list.
- * Note that when getting the size of a list variable, it will only return the size of the getFirst layer of elements.
+ * Note that when getting the size of a list variable, it will only return the size of the first layer of elements.
  * If you want to get the whole list size, including nested layers in a variable, use the recursive size instead.
  *
  * @author Olyno, Mwexim
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDateInformation.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDateInformation.java
index ff8f362d..d940e435 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDateInformation.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDateInformation.java
@@ -19,7 +19,7 @@
  * @author Mwexim
  * @name Date Information
  * @type EXPRESSION
- * @pattern [the] (year[s]|month[s]|day[s] (of|in) year|day[s] (of|in) month|day[s] (of|in) week|hour[s]|minute[s]|getSecond[s]|milli[getSecond][s]) (of|in) %date/time%
+ * @pattern [the] (year[s]|month[s]|day[s] (of|in) year|day[s] (of|in) month|day[s] (of|in) week|hour[s]|minute[s]|second[s]|milli[second][s]) (of|in) %date/time%
  * @pattern [the] (era|month|weekday|day [(of|in) week]) [name] (of|in) [date] %date%
  * @since ALPHA
  */
@@ -32,8 +32,8 @@ public class ExprDateInformation implements Expression<Object> {
         {"day[s] (of|in) week", (Function<LocalDateTime, Number>) val -> val.getDayOfWeek().getValue()},
         {"hour[s]", (Function<LocalDateTime, Number>) LocalDateTime::getHour},
         {"minute[s]", (Function<LocalDateTime, Number>) LocalDateTime::getMinute},
-        {"getSecond[s]", (Function<LocalDateTime, Number>) LocalDateTime::getSecond},
-        {"milli[getSecond][s]", (Function<LocalDateTime, Number>) val -> val.getNano() / 1_000_000}
+        {"second[s]", (Function<LocalDateTime, Number>) LocalDateTime::getSecond},
+        {"milli[second][s]", (Function<LocalDateTime, Number>) val -> val.getNano() / 1_000_000}
     });
 
     private static final PatternInfos<Function<LocalDateTime, String>> STRING_VALUES = new PatternInfos<>(new Object[][]{
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDefaultValue.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDefaultValue.java
index 1b5343ef..6a5c3eb9 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDefaultValue.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDefaultValue.java
@@ -6,7 +6,7 @@
 import io.github.syst3ms.skriptparser.parsing.ParseContext;
 
 /**
- * A shorthand expression for giving things a default value. If the getFirst thing isn't set, the getSecond thing will be returned.
+ * A shorthand expression for giving things a default value. If the first thing isn't set, the second thing will be returned.
  *
  * @author Olyno
  * @name Default Value
@@ -18,7 +18,7 @@ public class ExprDefaultValue implements Expression<Object> {
         Parser.getMainRegistration().newExpression(ExprDefaultValue.class, Object.class, false,
                 "%objects% (otherwise|?) %objects%")
             .name("Default Value")
-            .description("Returns the getFirst expression if it's set, otherwise the getSecond expression.")
+            .description("Returns the first expression if it's set, otherwise the second expression.")
             .examples("set {_var} to {_otherVarIfSet} otherwise \"world\"",
                 "send {_varIfSet} ? \"ruh roh, no message\"")
             .since("1.0.0");
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDurationSinceUntil.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDurationSinceUntil.java
index 641e4e73..5029b174 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDurationSinceUntil.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprDurationSinceUntil.java
@@ -10,8 +10,8 @@
 
 /**
  * Compares the given date with the current date.
- * Note that the getFirst pattern is to compare with the past
- * and the getSecond one to compare with the future.
+ * Note that the first pattern is to compare with the past
+ * and the second one to compare with the future.
  * Note that the accuracy can be off some milliseconds.
  *
  * @author Mwexim
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprElement.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprElement.java
index 591cf455..3e323815 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprElement.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprElement.java
@@ -16,8 +16,8 @@
  * @author Mwexim
  * @name Element
  * @type EXPRESSION
- * @pattern ([the] getFirst | [the] last | [a] random | [the] % integer % ( st | nd | rd | th)) element out [of] %objects%
- * @pattern [the] (getFirst|last) %integer% elements out [of] %objects%
+ * @pattern ([the] first | [the] last | [a] random | [the] % integer % ( st | nd | rd | th)) element out [of] %objects%
+ * @pattern [the] (first|last) %integer% elements out [of] %objects%
  * @pattern %integer% random elements out [of] %objects%
  * @pattern %objects%\[%integer%\]
  * @since ALPHA
@@ -27,8 +27,8 @@ public class ExprElement implements Expression<Object> {
 
     static {
         Parser.getMainRegistration().newExpression(ExprElement.class, Object.class, true,
-                "(0:[the] getFirst|1:[the] last|2:[a] random|3:[the] %integer%(st|nd|rd|th)) element [out] of %objects%",
-                "[the] (0:getFirst|1:last) %integer% elements [out] of %objects%",
+                "(0:[the] first|1:[the] last|2:[a] random|3:[the] %integer%(st|nd|rd|th)) element [out] of %objects%",
+                "[the] (0:first|1:last) %integer% elements [out] of %objects%",
                 "%integer% random elements [out] of %objects%",
                 "%objects%\\[%integer%\\]")
             .name("Element")
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprLoopValue.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprLoopValue.java
index e030067e..aa4cb36c 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprLoopValue.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprLoopValue.java
@@ -75,7 +75,7 @@ public Function<? super List<? extends SecLoop>, Optional<? extends SecLoop>> ge
         return sections -> {
             int j = 1;
             SecLoop loop = null;
-            // The closest section is getFirst, let's reverse this behavior for convenience
+            // The closest section is first, let's reverse this behavior for convenience
             Collections.reverse(sections);
             for (SecLoop l : sections) {
                 Class<?> loopedType = l.getLoopedExpression().getReturnType();
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprStringOccurrence.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprStringOccurrence.java
index fbc26d21..09fd54d7 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprStringOccurrence.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprStringOccurrence.java
@@ -7,21 +7,21 @@
 import io.github.syst3ms.skriptparser.util.DoubleOptional;
 
 /**
- * The index of the getFirst or last occurrence of a given string in a string.
+ * The index of the first or last occurrence of a given string in a string.
  * Note that indices in Skript start at 1.
  *
  * @author Mwexim
  * @name Occurrence
  * @type EXPRESSION
- * @pattern [the] (getFirst|last) occurrence of %string% in %string%
+ * @pattern [the] (first|last) occurrence of %string% in %string%
  * @since ALPHA
  */
 public class ExprStringOccurrence implements Expression<Number> {
     static {
         Parser.getMainRegistration().newExpression(ExprStringOccurrence.class, Number.class, true,
-                "[the] (0:getFirst|1:last) occurrence of %string% in %string%")
+                "[the] (0:first|1:last) occurrence of %string% in %string%")
             .name("Occurrence")
-            .description("Returns the index of the getFirst or last occurrence of a given string in a string.")
+            .description("Returns the index of the first or last occurrence of a given string in a string.")
             .since("1.0.0")
             .register();
     }
@@ -50,7 +50,7 @@ public Number[] getValues(TriggerContext ctx) {
 
     @Override
     public String toString(TriggerContext ctx, boolean debug) {
-        return (first ? "getFirst" : "last") + " occurrence of " + needle.toString(ctx, debug) + " in " + haystack.toString(ctx, debug);
+        return (first ? "first" : "last") + " occurrence of " + needle.toString(ctx, debug) + " in " + haystack.toString(ctx, debug);
     }
 
 }
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprSubstring.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprSubstring.java
index 0ea8a615..9752b2b2 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprSubstring.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprSubstring.java
@@ -19,8 +19,8 @@ public class ExprSubstring implements Expression<String> {
     static {
         Parser.getMainRegistration().newExpression(ExprSubstring.class, String.class, true,
                 "[the] (part|sub[ ](text|string)) of %string% (between|from) [(ind(ex[es]|ices)|char[acter][s])] %integer% (and|to) [(index|char[acter])] %integer%",
-                "[the] (0:getFirst|1:last) [%integer%] char[acter][s] (of|in) %string%",
-                "[the] %integer% (0:getFirst|1:last) char[acter]s (of|in) %string%")
+                "[the] (0:first|1:last) [%integer%] char[acter][s] (of|in) %string%",
+                "[the] %integer% (0:first|1:last) char[acter]s (of|in) %string%")
             .name("Substring")
             .description("Extracts a part of a string.")
             .since("1.0.0")
@@ -93,7 +93,7 @@ public String toString(TriggerContext ctx, boolean debug) {
             return "substring of " + value.toString(ctx, debug)
                 + " from " + lower.toString(ctx, debug) + " to " + upper.toString(ctx, debug);
         } else {
-            return (first ? "getFirst " : "last ") + (lower != null ? lower.toString(ctx, debug) : "")
+            return (first ? "first " : "last ") + (lower != null ? lower.toString(ctx, debug) : "")
                 + " characters of " + value.toString(ctx, debug);
         }
     }
diff --git a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprTernary.java b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprTernary.java
index d5b8f9cd..7b419eda 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprTernary.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/expressions/ExprTernary.java
@@ -20,7 +20,7 @@ public class ExprTernary implements Expression<Object> {
                 "%objects% if %=boolean%[,] (otherwise|else) %objects%",
                 "%=boolean% ? %objects% \\: %objects%")
             .name("Ternary")
-            .description("Returns the getFirst object if the boolean is true, otherwise the getSecond object.")
+            .description("Returns the first object if the boolean is true, otherwise the second object.")
             .since("1.0.0")
             .register();
     }
diff --git a/src/main/java/io/github/syst3ms/skriptparser/file/FileParser.java b/src/main/java/io/github/syst3ms/skriptparser/file/FileParser.java
index b7b585cc..6e709ba2 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/file/FileParser.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/file/FileParser.java
@@ -22,7 +22,7 @@ public class FileParser {
      *
      * @param fileName            the name of the file the lines belong to
      * @param lines               the list of lines to parse
-     * @param expectedIndentation the indentation level the getFirst line is expected to be at
+     * @param expectedIndentation the indentation level the first line is expected to be at
      * @param lastLine            a parameter that keeps track of the line count throughout recursive calls of this method when
      *                            parsing sections
      * @param logger              the logger
diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/CodeSection.java b/src/main/java/io/github/syst3ms/skriptparser/lang/CodeSection.java
index dce182ec..94c0807b 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/CodeSection.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/CodeSection.java
@@ -90,7 +90,7 @@ public final void setItems(List<Statement> items) {
     }
 
     /**
-     * @return the getFirst item of this section, or the item after the section if it's empty, or {@code null} if there is
+     * @return the first item of this section, or the item after the section if it's empty, or {@code null} if there is
      * no item after this section, in the latter case
      */
     public final Optional<? extends Statement> getFirst() {
diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/Statement.java b/src/main/java/io/github/syst3ms/skriptparser/lang/Statement.java
index b432928d..740b2a37 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/Statement.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/Statement.java
@@ -31,7 +31,7 @@ public static void setExceptionHandler(Consumer<Exception> consumer) {
      * Runs all code starting at a given point sequentially.
      * Do note this will not clear local variables after running.
      *
-     * @param start   the Statement the method should getFirst run
+     * @param start   the Statement the method should first run
      * @param context the context
      * @return {@code true} if the code ran normally, and {@code false} if any exception occurred
      */
diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/Variable.java b/src/main/java/io/github/syst3ms/skriptparser/lang/Variable.java
index b5d0974f..1a4b68fb 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/Variable.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/Variable.java
@@ -29,7 +29,7 @@
 
 /**
  * A reference to a variable, whose value is only known at runtime. It can be local to the event, meaning it isn't
- * defined outside of the event it was getFirst defined in. It can also be a list of multiple values. It can also be both.
+ * defined outside of the event it was first defined in. It can also be a list of multiple values. It can also be both.
  *
  * @param <T> the common supertype of the possibly multiple values of the variable
  */
diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/control/Finishing.java b/src/main/java/io/github/syst3ms/skriptparser/lang/control/Finishing.java
index d9caacba..ddce45b4 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/control/Finishing.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/control/Finishing.java
@@ -33,7 +33,7 @@ public interface Finishing {
      *     referenced to be {@linkplain Statement#walk(TriggerContext) walked} on.</li>
      *     <li>This method is <b>completely</b> stopped by any means whatsoever.</li>
      * </ol>
-     * An example of this getSecond occasion is {@link EffContinue} continuing over multiple loops.
+     * An example of this second occasion is {@link EffContinue} continuing over multiple loops.
      * If that effect continues 3 loops in one go, this means that the 2 most inner-loops need to be
      * completely reset, since they have the possibility to be looped over again. EffContinue therefore
      * calls this method on those loops.
diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/event/SkriptEvent.java b/src/main/java/io/github/syst3ms/skriptparser/lang/event/SkriptEvent.java
index 7f69c30c..6d234f76 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/event/SkriptEvent.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/event/SkriptEvent.java
@@ -55,7 +55,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, ParseContex
      * This is undesirable if we don't want the restriction of having to declare functions before using them. This is especially
      * counter-productive if we're dealing with multiple scripts.
      * <p>
-     * To solve this problem, {@link Trigger triggers} with a higher loading priority number will be loaded getFirst.
+     * To solve this problem, {@link Trigger triggers} with a higher loading priority number will be loaded first.
      *
      * @return the loading priority number. 0 by default
      */
diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/lambda/ArgumentSection.java b/src/main/java/io/github/syst3ms/skriptparser/lang/lambda/ArgumentSection.java
index 0d8e9a53..e7d804c4 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/lambda/ArgumentSection.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/lambda/ArgumentSection.java
@@ -16,7 +16,7 @@ public abstract class ArgumentSection extends CodeSection implements Finishing {
 
     /**
      * This function is called from the section containing the code, and returns an Optional describing
-     * the getFirst {@link Statement} that should be run in the consumer.
+     * the first {@link Statement} that should be run in the consumer.
      * <br>
      * By default, returns {@link CodeSection#getFirst()}.
      */
diff --git a/src/main/java/io/github/syst3ms/skriptparser/lang/lambda/SectionValue.java b/src/main/java/io/github/syst3ms/skriptparser/lang/lambda/SectionValue.java
index 6dda7d0d..8f57485f 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/lang/lambda/SectionValue.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/lang/lambda/SectionValue.java
@@ -82,7 +82,7 @@ public boolean postInitialize(S section, ParseContext parseContext) {
      * Optional if no matching section was found. This is useful for targeting a specific section out of multiple
      * surrounding ones based on criteria specific to the implementation.
      * <p>
-     * By default, this always picks the getFirst matching function (i.e the innermost one), if there is one.
+     * By default, this always picks the first matching function (i.e the innermost one), if there is one.
      *
      * @return the selector function for this {@code SectionValue}.
      */
diff --git a/src/main/java/io/github/syst3ms/skriptparser/parsing/ParserState.java b/src/main/java/io/github/syst3ms/skriptparser/parsing/ParserState.java
index c07ed632..b8388057 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/parsing/ParserState.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/parsing/ParserState.java
@@ -45,7 +45,7 @@ public void setCurrentContexts(Set<Class<? extends TriggerContext>> currentConte
     }
 
     /**
-     * @return a list of all enclosing {@linkplain CodeSection}s, with the closest one getFirst
+     * @return a list of all enclosing {@linkplain CodeSection}s, with the closest one first
      */
     public LinkedList<CodeSection> getCurrentSections() {
         return new LinkedList<>(currentSections);
diff --git a/src/main/java/io/github/syst3ms/skriptparser/parsing/SyntaxParser.java b/src/main/java/io/github/syst3ms/skriptparser/parsing/SyntaxParser.java
index cd9b4efc..87f79135 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/parsing/SyntaxParser.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/parsing/SyntaxParser.java
@@ -154,7 +154,7 @@ public static <T> Optional<? extends Expression<? extends T>> parseExpression(St
         if (s.toLowerCase().startsWith("list ")) {
             s = s.substring("list ".length());
         } else {
-            // We parse boolean operators getFirst to prevent clutter while parsing.
+            // We parse boolean operators first to prevent clutter while parsing.
             var booleanOperator = matchExpressionInfo(s, EXPRESSION_BOOLEAN_OPERATORS, expectedType, parserState, logger);
             if (booleanOperator.isPresent()) {
                 recentExpressions.acknowledge(EXPRESSION_BOOLEAN_OPERATORS);
diff --git a/src/main/java/io/github/syst3ms/skriptparser/pattern/ExpressionElement.java b/src/main/java/io/github/syst3ms/skriptparser/pattern/ExpressionElement.java
index 636163c0..098f1084 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/pattern/ExpressionElement.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/pattern/ExpressionElement.java
@@ -224,7 +224,7 @@ private <T> Optional<? extends Expression<? extends T>> parse(String s, PatternT
             });
             /*
              * If multiple types are possible, and a variable is matched, it will have the type
-             * of the getFirst option, but all options should be supported.
+             * of the first option, but all options should be supported.
              * We manually change the return type of the variable awaiting a major overhaul.
              * TODO create a better type system for this that supports union types
              */
diff --git a/src/main/java/io/github/syst3ms/skriptparser/pattern/PatternElement.java b/src/main/java/io/github/syst3ms/skriptparser/pattern/PatternElement.java
index 1da32d37..b1a38177 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/pattern/PatternElement.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/pattern/PatternElement.java
@@ -44,7 +44,7 @@ static List<String> getKeywords(PatternElement element) {
     }
 
     static List<PatternElement> getPossibleInputs(List<PatternElement> elements) {
-        List<PatternElement> optionalPossibilities = new ArrayList<>(); // We generally want to get the non-optional ones out of the way getFirst
+        List<PatternElement> optionalPossibilities = new ArrayList<>(); // We generally want to get the non-optional ones out of the way first
         List<PatternElement> possibilities = new ArrayList<>();
         for (var element : elements) {
             if (element instanceof TextElement || element instanceof RegexGroup) {
diff --git a/src/main/java/io/github/syst3ms/skriptparser/pattern/PatternParser.java b/src/main/java/io/github/syst3ms/skriptparser/pattern/PatternParser.java
index 4a915ba9..545c6852 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/pattern/PatternParser.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/pattern/PatternParser.java
@@ -95,8 +95,8 @@ private static Optional<? extends PatternElement> parsePattern(String pattern, S
                     optionalGroup = parsePattern(matcher.group(3), logger)
                             .map(el -> {
                                 if (el instanceof ChoiceGroup && mark.isEmpty())
-                                    // Patterns like '[:(getFirst|getSecond)]' act differently than in the original Skript.
-                                    // Developers probably want to write ':[getFirst|getSecond]' instead, but the two actually
+                                    // Patterns like '[:(first|second)]' act differently than in the original Skript.
+                                    // Developers probably want to write ':[first|second]' instead, but the two actually
                                     // have different behavior.
                                     logger.warn(
                                             "The parse mark in the '"
diff --git a/src/main/java/io/github/syst3ms/skriptparser/pattern/TextElement.java b/src/main/java/io/github/syst3ms/skriptparser/pattern/TextElement.java
index 740f29dd..aa6a06cf 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/pattern/TextElement.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/pattern/TextElement.java
@@ -33,7 +33,7 @@ public int match(String s, int index, MatchContext context) {
         }
         var end = 0;
         var stripped = text.strip();
-        // We advance until we reach the getFirst non-whitespace character in s
+        // We advance until we reach the first non-whitespace character in s
         if (index + start + stripped.length() > s.length()) {
             return -1;
         }
diff --git a/src/main/java/io/github/syst3ms/skriptparser/sections/SecSwitch.java b/src/main/java/io/github/syst3ms/skriptparser/sections/SecSwitch.java
index 0a7b8802..7f787c36 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/sections/SecSwitch.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/sections/SecSwitch.java
@@ -59,7 +59,7 @@ public class SecSwitch extends CodeSection implements Finishing {
         Parser.getMainRegistration().newSection(SecSwitch.class,
                 "(switch|given|match) %object%")
             .name("Switch")
-            .description("This section will run the code of the getFirst matching case.")
+            .description("This section will run the code of the first matching case.")
             .examples("on entity damage:",
                 "\tswitch npc type of context-victim:",
                 "\t\tcase sheep:",
diff --git a/src/main/java/io/github/syst3ms/skriptparser/structures/functions/DefaultFunctions.java b/src/main/java/io/github/syst3ms/skriptparser/structures/functions/DefaultFunctions.java
index 44bb315a..761e6ca3 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/structures/functions/DefaultFunctions.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/structures/functions/DefaultFunctions.java
@@ -20,7 +20,7 @@ public Number[] executeSimple(Object[][] params) {
                 }
             })
             .name("Mod")
-            .description("Returns the remainder of the division of the getFirst number by the getSecond one.")
+            .description("Returns the remainder of the division of the first number by the second one.")
             .examples("set {_remainder} to mod(10, 3)",
                 "if mod({_var}, 2) = 0:")
             .since("1.0.0")
diff --git a/src/main/java/io/github/syst3ms/skriptparser/types/changers/Arithmetic.java b/src/main/java/io/github/syst3ms/skriptparser/types/changers/Arithmetic.java
index 420b3715..1032b1b7 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/types/changers/Arithmetic.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/types/changers/Arithmetic.java
@@ -3,8 +3,8 @@
 /**
  * An interface describing arithmetic operations between two types
  *
- * @param <A> the getFirst type
- * @param <R> the getSecond type
+ * @param <A> the first type
+ * @param <R> the second type
  */
 public interface Arithmetic<A, R> {
 
diff --git a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Comparator.java b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Comparator.java
index 19d9dbb3..1db6147f 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Comparator.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Comparator.java
@@ -5,8 +5,8 @@
 /**
  * An interface for comparing values of two given types
  *
- * @param <T1> the getFirst type
- * @param <T2> the getSecond value
+ * @param <T1> the first type
+ * @param <T2> the second value
  * @see Comparators
  */
 public abstract class Comparator<T1, T2> implements BiFunction<T1, T2, Relation> {
@@ -17,8 +17,8 @@ public Comparator(boolean supportsOrdering) {
     }
 
     /**
-     * @param t1 the getFirst value
-     * @param t2 the getSecond value
+     * @param t1 the first value
+     * @param t2 the second value
      * @return the {@linkplain Relation relation} between the two values
      */
     @Override
diff --git a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/ComparatorInfo.java b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/ComparatorInfo.java
index 0eb7837e..eee2cb0d 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/ComparatorInfo.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/ComparatorInfo.java
@@ -3,8 +3,8 @@
 /**
  * A class containing information about a {@link Comparator}
  *
- * @param <T1> the getFirst type
- * @param <T2> the getSecond type
+ * @param <T1> the first type
+ * @param <T2> the second type
  */
 public record ComparatorInfo<T1, T2>(Class<T1> firstClass, Class<T2> secondClass, Comparator<T1, T2> comparator) {
 
diff --git a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Comparators.java b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Comparators.java
index d8479f55..ca509702 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Comparators.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Comparators.java
@@ -32,8 +32,8 @@ public Relation apply(@Nullable Object o, @Nullable Object o2) {
     /**
      * Registers a {@link Comparator}.
      *
-     * @param t1 class of getFirst type
-     * @param t2 class of getSecond type
+     * @param t1 class of first type
+     * @param t2 class of second type
      * @param c  the comparator
      * @throws IllegalArgumentException if any given class is equal to <code>Object.class</code>
      */
diff --git a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/InverseComparator.java b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/InverseComparator.java
index dd990073..268d8fed 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/InverseComparator.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/InverseComparator.java
@@ -3,8 +3,8 @@
 /**
  * A {@linkplain Comparator} that is the opposite of another one
  *
- * @param <T1> the getFirst type
- * @param <T2> the getSecond type
+ * @param <T1> the first type
+ * @param <T2> the second type
  */
 public class InverseComparator<T1, T2> extends Comparator<T1, T2> {
     private final Comparator<? super T2, ? super T1> comparator;
diff --git a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Relation.java b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Relation.java
index 781f044e..e3c68242 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Relation.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/types/comparisons/Relation.java
@@ -13,19 +13,19 @@ public enum Relation {
      */
     NOT_EQUAL(0),
     /**
-     * The getFirst object is greater than the other one
+     * The first object is greater than the other one
      */
     GREATER(1),
     /**
-     * The getFirst object is greater or equal to the other one
+     * The first object is greater or equal to the other one
      */
     GREATER_OR_EQUAL(1),
     /**
-     * The getFirst object is smaller than the other one
+     * The first object is smaller than the other one
      */
     SMALLER(-1),
     /**
-     * The getFirst object is smaller or equal to the other one
+     * The first object is smaller or equal to the other one
      */
     SMALLER_OR_EQUAL(-1);
 
diff --git a/src/main/java/io/github/syst3ms/skriptparser/types/conversions/ChainedConverter.java b/src/main/java/io/github/syst3ms/skriptparser/types/conversions/ChainedConverter.java
index 3753cf68..0446b95f 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/types/conversions/ChainedConverter.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/types/conversions/ChainedConverter.java
@@ -9,7 +9,7 @@
  * Used to chain converters to build a single converter. This is automatically created when a new converter is added.
  *
  * @param <F> same as Converter's <F> (from)
- * @param <M> the middle type, i.e. the type the getFirst converter converts to and the getSecond converter comverts from.
+ * @param <M> the middle type, i.e. the type the first converter converts to and the second converter comverts from.
  * @param <T> same as Converter's <T> (to)
  * @author Peter Güttinger
  * @see Converters#registerConverter(Class, Class, Function)
diff --git a/src/main/java/io/github/syst3ms/skriptparser/types/conversions/Converters.java b/src/main/java/io/github/syst3ms/skriptparser/types/conversions/Converters.java
index 8784b2ce..35b8dbdb 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/types/conversions/Converters.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/types/conversions/Converters.java
@@ -23,11 +23,11 @@ public abstract class Converters {
      */
     public static final int ALL_CHAINING = 0;
     /**
-     * A flag declaring a converter may only be the getFirst part of a {@link ChainedConverter}
+     * A flag declaring a converter may only be the first part of a {@link ChainedConverter}
      */
     public static final int NO_LEFT_CHAINING = 1;
     /**
-     * A flag declaring a converter may only be the getSecond part of a {@link ChainedConverter}
+     * A flag declaring a converter may only be the second part of a {@link ChainedConverter}
      */
     public static final int NO_RIGHT_CHAINING = 2;
     /**
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/DoubleOptional.java b/src/main/java/io/github/syst3ms/skriptparser/util/DoubleOptional.java
index 23cee843..e1c8f600 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/DoubleOptional.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/DoubleOptional.java
@@ -17,8 +17,8 @@
  * <p>
  * Note that the two values aren't really independent : either both are set, or both are empty.
  *
- * @param <T1> the type of the getFirst value
- * @param <T2> the type of the getSecond value
+ * @param <T1> the type of the first value
+ * @param <T2> the type of the second value
  */
 public class DoubleOptional<T1, T2> {
     /**
@@ -27,12 +27,12 @@ public class DoubleOptional<T1, T2> {
     private static final DoubleOptional<?, ?> EMPTY = new DoubleOptional<>();
 
     /**
-     * If non-null, the getFirst value is present ; if null, it is absent.
+     * If non-null, the first value is present ; if null, it is absent.
      */
     @Nullable
     private final T1 first;
     /**
-     * If non-null, the getSecond value is present ; if null, it is absent.
+     * If non-null, the second value is present ; if null, it is absent.
      */
     @Nullable
     private final T2 second;
@@ -48,8 +48,8 @@ private DoubleOptional() {
     /**
      * Constructs a non-empty instance.
      *
-     * @param first  the getFirst value
-     * @param second the getSecond value
+     * @param first  the first value
+     * @param second the second value
      * @throws NullPointerException if either parameters are {@literal null}.
      */
     private DoubleOptional(T1 first, T2 second) {
@@ -60,8 +60,8 @@ private DoubleOptional(T1 first, T2 second) {
     /**
      * Returns an empty {@code DoubleOptional} instance.
      *
-     * @param <T1> the type of the getFirst non-existent value
-     * @param <T2> the type of the getSecond non-existent value
+     * @param <T1> the type of the first non-existent value
+     * @param <T2> the type of the second non-existent value
      * @return an empty {@code DoubleOptional}
      */
     @SuppressWarnings("unchecked")
@@ -73,12 +73,12 @@ public static <T1, T2> DoubleOptional<T1, T2> empty() {
      * Returns an {@code Optional} describing the given non-{@code null}
      * value.
      *
-     * @param first  the getFirst value to describe, which must be non-{@code null}
-     * @param second the getSecond value to describe, which must be non-{@code null}
-     * @param <T1>   the type of the getFirst value
-     * @param <T2>   the type fo the getSecond value
+     * @param first  the first value to describe, which must be non-{@code null}
+     * @param second the second value to describe, which must be non-{@code null}
+     * @param <T1>   the type of the first value
+     * @param <T2>   the type fo the second value
      * @return a {@code DoubleOptional} with the value present
-     * @throws NullPointerException if either getFirst or getSecond are {@code null}
+     * @throws NullPointerException if either first or second are {@code null}
      */
     public static <T1, T2> DoubleOptional<T1, T2> of(T1 first, T2 second) {
         return new DoubleOptional<>(first, second);
@@ -88,10 +88,10 @@ public static <T1, T2> DoubleOptional<T1, T2> of(T1 first, T2 second) {
      * Returns a {@code DoubleOptional} describing the given values, if
      * both non-{@code null}, otherwise returns an empty {@code DoubleOptional}.
      *
-     * @param first  the getFirst possibly {@code null} value to describe
+     * @param first  the first possibly {@code null} value to describe
      * @param second the secpond possibly {@code null} value to describe
-     * @param <T1>   the type of the getFirst value
-     * @param <T2>   the type of the getSecond value
+     * @param <T1>   the type of the first value
+     * @param <T2>   the type of the second value
      * @return a {@code DoubleOptional} with both values present if the specified values
      * are both non-{@code null}, otherwise an empty {@code DoubleOptional}
      */
@@ -103,10 +103,10 @@ public static <T1, T2> DoubleOptional<T1, T2> ofNullable(@Nullable T1 first, @Nu
      * Returns a {@code DoubleOptional} describing the values represented by two {@link Optional}s if both
      * are present, otherwise returns an empty {@code DoubleOptional}.
      *
-     * @param first  a possibly empty {@link Optional} describing the getFirst value
-     * @param second a possibly empty {@link Optional} describing the getSecond value
-     * @param <T1>   the type of the getFirst value
-     * @param <T2>   the type of the getSecond value
+     * @param first  a possibly empty {@link Optional} describing the first value
+     * @param second a possibly empty {@link Optional} describing the second value
+     * @param <T1>   the type of the first value
+     * @param <T2>   the type of the second value
      * @return a {@code DoubleOptional} describing the two values described by the two {@link Optional}s,
      * if both are present, otherwise an empty {@code DoubleOptional}
      */
@@ -116,27 +116,27 @@ public static <T1, T2> DoubleOptional<T1, T2> ofOptional(Optional<T1> first, Opt
     }
 
     /**
-     * If the getFirst value is present, returns the value, otherwise throws a {@link NoSuchElementException}.
+     * If the first value is present, returns the value, otherwise throws a {@link NoSuchElementException}.
      *
-     * @return the non-null getFirst value of this {@code DoubleOptional}
-     * @throws NoSuchElementException if no getFirst value is present
+     * @return the non-null first value of this {@code DoubleOptional}
+     * @throws NoSuchElementException if no first value is present
      */
-    public T1 getFirst() {
+    public T1 first() {
         if (first == null) {
-            throw new NoSuchElementException("No getFirst value present");
+            throw new NoSuchElementException("No first value present");
         }
         return first;
     }
 
     /**
-     * If the getSecond value is present, returns the value, otherwise throws a {@link NoSuchElementException}.
+     * If the second value is present, returns the value, otherwise throws a {@link NoSuchElementException}.
      *
-     * @return the non-null getSecond value of this {@code DoubleOptional}
-     * @throws NoSuchElementException if no getSecond value is present
+     * @return the non-null second value of this {@code DoubleOptional}
+     * @throws NoSuchElementException if no second value is present
      */
-    public T2 getSecond() {
+    public T2 second() {
         if (second == null) {
-            throw new NoSuchElementException("No getSecond value present");
+            throw new NoSuchElementException("No second value present");
         }
         return second;
     }
@@ -171,7 +171,7 @@ public void ifPresent(BiConsumer<? super T1, ? super T2> action) {
     }
 
     /**
-     * If both values are present, does the getFirst action using both values, otherwise does the getSecond action.
+     * If both values are present, does the first action using both values, otherwise does the second action.
      *
      * @param action      the action to be performed if both values are present
      * @param emptyAction the action to be performed if either values are absent
@@ -207,10 +207,10 @@ public DoubleOptional<T1, T2> filter(BiPredicate<? super T1, ? super T2> predica
      * <p>
      * If either mapping function returns {@code null}, the result will be an empty {@code DoubleOptional}.
      *
-     * @param firstMapper  the mapping function to apply to the getFirst value, if present
-     * @param secondMapper the mapping function to apply to the getSecond value, if present
-     * @param <U>          the new type of the getFirst value
-     * @param <V>          the new type of the getSecond value
+     * @param firstMapper  the mapping function to apply to the first value, if present
+     * @param secondMapper the mapping function to apply to the second value, if present
+     * @param <U>          the new type of the first value
+     * @param <V>          the new type of the second value
      * @return a {@code DoubleOptional} describing the result of applying mapping functions
      * to each of the values if present, and an empty {@code DoubleOptional} otherwise.
      */
@@ -251,8 +251,8 @@ public <U> Optional<U> mapToOptional(BiFunction<? super T1, ? super T2, ? extend
      * {@code DoubleOptional}.
      *
      * @param mapper the mapping function taking in both values (if present) and returning a {@code DoubleOptional}
-     * @param <U>    the type of the getFirst value of the new {@code DoubleOptional}
-     * @param <V>    the type of the getSecond value of the new {@code DoubleOptional}
+     * @param <U>    the type of the first value of the new {@code DoubleOptional}
+     * @param <V>    the type of the second value of the new {@code DoubleOptional}
      * @return the result of applying the mapping function to both values if present, and an empty {@code DoubleOptional}
      * otherwise
      * @throws NullPointerException if the mapping function returns {@code null}
@@ -309,10 +309,10 @@ public DoubleOptional<T1, T2> or(Supplier<? extends DoubleOptional<? extends T1,
     }
 
     /**
-     * If the getFirst value is present, returns it, otherwise returns {@code other}.
+     * If the first value is present, returns it, otherwise returns {@code other}.
      *
-     * @param other the value to be returned if the getFirst value is not present (may be {@code null})
-     * @return the getFirst value if present, otherwise {@code other}
+     * @param other the value to be returned if the first value is not present (may be {@code null})
+     * @return the first value if present, otherwise {@code other}
      */
     @Contract("!null -> !null")
     @Nullable
@@ -321,10 +321,10 @@ public T1 firstOrElse(@Nullable T1 other) {
     }
 
     /**
-     * If the getSecond value is present, returns it, otherwise returns {@code other}.
+     * If the second value is present, returns it, otherwise returns {@code other}.
      *
-     * @param other the value to be returned if the getSecond value is not present (may be {@code null})
-     * @return the getSecond value if present, otherwise {@code other}
+     * @param other the value to be returned if the second value is not present (may be {@code null})
+     * @return the second value if present, otherwise {@code other}
      */
     @Contract("!null -> !null")
     @Nullable
@@ -333,13 +333,13 @@ public T2 secondOrElse(@Nullable T2 other) {
     }
 
     /**
-     * If the getFirst value is present, returns it, otherwise throws an exception produced by the given
+     * If the first value is present, returns it, otherwise throws an exception produced by the given
      * exception-supplying function.
      *
-     * @param exceptionSupplier the function producing the exception to be thrown if the getFirst value is not present
+     * @param exceptionSupplier the function producing the exception to be thrown if the first value is not present
      * @param <X>               the type of exception that may be thrown
-     * @return the getFirst value if present
-     * @throws X if the getFirst value is not present
+     * @return the first value if present
+     * @throws X if the first value is not present
      */
     public <X extends Throwable> T1 firstOrElseThrow(Supplier<? extends X> exceptionSupplier) throws X {
         if (first != null) {
@@ -350,13 +350,13 @@ public <X extends Throwable> T1 firstOrElseThrow(Supplier<? extends X> exception
     }
 
     /**
-     * If the getSecond value is present, returns it, otherwise throws an exception produced by the given
+     * If the second value is present, returns it, otherwise throws an exception produced by the given
      * exception-supplying function.
      *
-     * @param exceptionSupplier the function producing the exception to be thrown if the getSecond value is not present
+     * @param exceptionSupplier the function producing the exception to be thrown if the second value is not present
      * @param <X>               the type of exception that may be thrown
-     * @return the getSecond value if present
-     * @throws X if the getSecond value is not present
+     * @return the second value if present
+     * @throws X if the second value is not present
      */
     public <X extends Throwable> T2 secondOrElseThrow(Supplier<? extends X> exceptionSupplier) throws X {
         if (second != null) {
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/DurationUtils.java b/src/main/java/io/github/syst3ms/skriptparser/util/DurationUtils.java
index 8e683728..4f679543 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/DurationUtils.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/DurationUtils.java
@@ -10,7 +10,7 @@ public class DurationUtils {
      * clean alternative for this.
      */
     private static final String[] unitPatterns = {"years?", "weeks?", "days?", "hours?", "minutes?", "seconds?", "ticks?", "milli(second)?s?"};
-    private static final String[] unitNames = {"year", "week", "day", "hour", "minute", "getSecond", "tick", "millisecond"};
+    private static final String[] unitNames = {"year", "week", "day", "hour", "minute", "second", "tick", "millisecond"};
     /**
      * The amount of milliseconds it takes for a tick to pass.
      * A 'tick' is a predetermined time-unit of 50 milliseconds.
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/FileUtils.java b/src/main/java/io/github/syst3ms/skriptparser/util/FileUtils.java
index 407a99de..621791ac 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/FileUtils.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/FileUtils.java
@@ -28,7 +28,7 @@ public class FileUtils {
      * before a line break to indicate to the parser that it should be considered as a single line. For example :
      * <pre>
      *     set {large_list::*} to "one long string", \
-     *                            "a getSecond long string", \
+     *                            "a second long string", \
      *                            "yet another long string" \
      *                            "an even longer string which would make reading very awkward otherwise", \
      *                            "nearing the end of the list" and \
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/Pair.java b/src/main/java/io/github/syst3ms/skriptparser/util/Pair.java
index 25cb6433..0b7c2fb2 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/Pair.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/Pair.java
@@ -3,15 +3,15 @@
 /**
  * A simple pair of two values.
  *
- * @param <T> type of the getFirst value
- * @param <U> type of the getSecond value
+ * @param <T> type of the first value
+ * @param <U> type of the second value
  */
 public record Pair<T, U>(T getFirst, U getSecond) {
 
     /**
-     * Retrieves the getFirst element
+     * Retrieves the first element
      *
-     * @return the getFirst element
+     * @return the first element
      */
     @Override
     public T getFirst() {
@@ -19,9 +19,9 @@ public T getFirst() {
     }
 
     /**
-     * Retrieves the getSecond element
+     * Retrieves the second element
      *
-     * @return the getSecond element
+     * @return the second element
      */
     @Override
     public U getSecond() {
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/RecentElementList.java b/src/main/java/io/github/syst3ms/skriptparser/util/RecentElementList.java
index 2eeb4066..b7889696 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/RecentElementList.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/RecentElementList.java
@@ -16,7 +16,7 @@
  * them against a string that's being parsed.
  * <p>
  * To illustrate the behaviour of this class, imagine you use some syntax A 8 times, then use syntax B once. The very
- * next time the parser does the "recent syntaxes" check, it will check syntax A getFirst, because it was used more than syntax B.
+ * next time the parser does the "recent syntaxes" check, it will check syntax A first, because it was used more than syntax B.
  *
  * @param <T> the type of {@link SyntaxInfo}
  */
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/StringUtils.java b/src/main/java/io/github/syst3ms/skriptparser/util/StringUtils.java
index 4b04991e..f5cea929 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/StringUtils.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/StringUtils.java
@@ -163,12 +163,12 @@ public static Optional<String> getBracketContent(String s, int start, char closi
     }
 
     /**
-     * Find the getFirst occurrence of a string in another one, ignoring case
+     * Find the first occurrence of a string in another one, ignoring case
      *
      * @param haystack the string to look in
      * @param needle   the string to look for
      * @param start    where to look from
-     * @return the index of the getFirst occurrence
+     * @return the index of the first occurrence
      */
     public static int indexOfIgnoreCase(String haystack, String needle, int start) {
         if (needle.isEmpty() || haystack.isEmpty()) {
@@ -311,7 +311,7 @@ else if (plural)
     }
 
     /**
-     * Capitalizes the getFirst word or all words in a string.
+     * Capitalizes the first word or all words in a string.
      * A word is separated by a space character.
      *
      * @param str the string to change
@@ -401,7 +401,7 @@ else if (Character.isLowerCase(c))
     }
 
     /**
-     * Mirrors the string. This means the last character will be put getFirst and vice versa.
+     * Mirrors the string. This means the last character will be put first and vice versa.
      *
      * @param str the string to change
      * @return the mirrored string
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/math/NumberMath.java b/src/main/java/io/github/syst3ms/skriptparser/util/math/NumberMath.java
index 5c8bd73d..648f5162 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/math/NumberMath.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/math/NumberMath.java
@@ -383,7 +383,7 @@ private static List<Integer> sieveOfEratosthenes(int start, int end) {
         boolean[] isComposite = new boolean[size];
         List<Integer> computedPrimes = new ArrayList<>();
 
-        // We getFirst disqualify multiples of primes that have been generated before
+        // We first disqualify multiples of primes that have been generated before
         if (cachedPrimes != null) {
             for (int gen : cachedPrimes) {
                 if (gen * gen > end)
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/math/PowerIterator.java b/src/main/java/io/github/syst3ms/skriptparser/util/math/PowerIterator.java
index b640e9ce..9628fa27 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/math/PowerIterator.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/math/PowerIterator.java
@@ -8,7 +8,7 @@
  * <p>This API allows to efficiently calculate the various powers of x in a taylor series by storing intermediate results.</p>
  * <p>For example x<sup>n</sup> can be calculated using one multiplication by storing the previously calculated x<sup>n-1</sup> and x.</p>
  *
- * <p>{@link #getCurrentPower()} will be called getFirst to retrieve the initial value.</p>
+ * <p>{@link #getCurrentPower()} will be called first to retrieve the initial value.</p>
  * <p>
  * For later iterations {@link #calculateNextPower()} will be called before {@link #getCurrentPower()}.
  * <p>
diff --git a/src/main/java/io/github/syst3ms/skriptparser/util/math/SeriesCalculator.java b/src/main/java/io/github/syst3ms/skriptparser/util/math/SeriesCalculator.java
index 6f17446c..1676fbf9 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/util/math/SeriesCalculator.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/util/math/SeriesCalculator.java
@@ -106,7 +106,7 @@ protected BigRational getFactor(int index) {
 
     /**
      * Returns the factor of the highest term already calculated.
-     * <p>When called for the getFirst time will return the factor of the getFirst term (index 0).</p>
+     * <p>When called for the first time will return the factor of the first term (index 0).</p>
      * <p>After this call the method {@link #calculateNextFactor()} will be called to prepare for the next term.</p>
      *
      * @return the factor of the highest term
diff --git a/src/main/java/io/github/syst3ms/skriptparser/variables/VariableStorage.java b/src/main/java/io/github/syst3ms/skriptparser/variables/VariableStorage.java
index 3d219c7d..bb9b1695 100644
--- a/src/main/java/io/github/syst3ms/skriptparser/variables/VariableStorage.java
+++ b/src/main/java/io/github/syst3ms/skriptparser/variables/VariableStorage.java
@@ -252,7 +252,7 @@ protected void loadVariable(String name, @NotNull String type, @NotNull JsonElem
     /**
      * Called after all storages have been loaded, and variables
      * have been redistributed if settings have changed.
-     * This should commit the getFirst transaction.
+     * This should commit the first transaction.
      */
     protected abstract void allLoaded();