diff --git a/rpgJavaInterpreter-core/src/main/antlr/RpgLexer.g4 b/rpgJavaInterpreter-core/src/main/antlr/RpgLexer.g4
index 51f111d6d..c78dc4c84 100644
--- a/rpgJavaInterpreter-core/src/main/antlr/RpgLexer.g4
+++ b/rpgJavaInterpreter-core/src/main/antlr/RpgLexer.g4
@@ -373,21 +373,21 @@ SPLAT_LOCK: '*'[lL][oO][cC][kK];
 SPLAT_PROGRAM: '*'[pP][rR][oO][gG][rR][aA][mM];
 SPLAT_EXTDESC: '*'[eE][xX][tT][dD][eE][sS][cC];
 //Durations
-SPLAT_D: '*'{getLastTokenType() == COLON}? [dD];
-SPLAT_H: '*'{getLastTokenType() == COLON}? [hH];
-SPLAT_HOURS: '*'{getLastTokenType() == COLON}? [hH][oO][uU][rR][sS];
+SPLAT_YEARS: SPLAT_YEAR[sS]{getLastTokenType() == COLON}?;
+SPLAT_MONTHS: SPLAT_MONTH[sS];
 SPLAT_DAYS:  SPLAT_DAY[sS]{getLastTokenType() == COLON}?;
-SPLAT_M: '*'{getLastTokenType() == COLON}? [mM];
+SPLAT_HOURS: '*'{getLastTokenType() == COLON}? [hH][oO][uU][rR][sS];
 SPLAT_MINUTES: '*'{getLastTokenType() == COLON}? [mM][iI][nN][uU][tT][eE][sS];
-SPLAT_MONTHS: SPLAT_MONTH[sS];
-SPLAT_MN: '*'{getLastTokenType() == COLON}? [mM][nN]; //Minutes
-SPLAT_MS: '*'{getLastTokenType() == COLON}? [mM][sS]; //Minutes
-SPLAT_MSECONDS: '*'{getLastTokenType() == COLON}? [mM][sS][eE][cC][oO][nN][dD][sS];
-SPLAT_S: '*'{getLastTokenType() == COLON}? [sS];
 SPLAT_SECONDS: '*'{getLastTokenType() == COLON}? [sS][eE][cC][oO][nN][dD][sS];
-SPLAT_Y: '*'{getLastTokenType() == COLON}? [yY];
-SPLAT_YEARS: SPLAT_YEAR[sS]{getLastTokenType() == COLON}?;
+SPLAT_MSECONDS: '*'{getLastTokenType() == COLON}? [mM][sS][eE][cC][oO][nN][dD][sS];
 
+SPLAT_Y: '*'{getLastTokenType() == COLON}? [yY];
+SPLAT_D: '*'{getLastTokenType() == COLON}? [dD];
+SPLAT_H: '*'{getLastTokenType() == COLON}? [hH];
+SPLAT_MN: '*'{getLastTokenType() == COLON}? [mM][nN]; // Minutes
+SPLAT_MS: '*'{getLastTokenType() == COLON}? [mM][sS]; // Microseconds
+SPLAT_M: '*'{getLastTokenType() == COLON}? [mM]; // Months
+SPLAT_S: '*'{getLastTokenType() == COLON}? [sS];
 
 // Reserved Words
 UDATE : [uU] [dD] [aA] [tT] [eE] ;