diff --git a/src/main/java/com/github/zafarkhaja/semver/GrammarException.java b/src/main/java/com/github/zafarkhaja/semver/GrammarException.java
index 3ea97b3..e63adf9 100644
--- a/src/main/java/com/github/zafarkhaja/semver/GrammarException.java
+++ b/src/main/java/com/github/zafarkhaja/semver/GrammarException.java
@@ -30,7 +30,7 @@ package com.github.zafarkhaja.semver;
  * @author Zafar Khaja <zafarkhaja@gmail.com>
  * @since 0.7.0
  */
-public class GrammarException extends ParserException {
+public class GrammarException extends ParseException {
 
     /**
      * Constructs a {@code GrammarException} instance with an error message.
diff --git a/src/main/java/com/github/zafarkhaja/semver/ParserException.java b/src/main/java/com/github/zafarkhaja/semver/ParseException.java
similarity index 83%
rename from src/main/java/com/github/zafarkhaja/semver/ParserException.java
rename to src/main/java/com/github/zafarkhaja/semver/ParseException.java
index b2cea5b..f2966c8 100644
--- a/src/main/java/com/github/zafarkhaja/semver/ParserException.java
+++ b/src/main/java/com/github/zafarkhaja/semver/ParseException.java
@@ -29,21 +29,21 @@ package com.github.zafarkhaja.semver;
  * @author Zafar Khaja <zafarkhaja@gmail.com>
  * @since 0.7.0
  */
-public class ParserException extends RuntimeException {
+public class ParseException extends RuntimeException {
 
     /**
-     * Constructs a {@code ParserException} instance with an error message.
+     * Constructs a {@code ParseException} instance with an error message.
      *
      * @param message the error message
      */
-    public ParserException(String message) {
+    public ParseException(String message) {
         super(message);
     }
 
     /**
-     * Constructs a {@code ParserException} instance with no error message.
+     * Constructs a {@code ParseException} instance with no error message.
      */
-    public ParserException() {
+    public ParseException() {
 
     }
 }
diff --git a/src/main/java/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java b/src/main/java/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java
index f5c4383..4207abf 100644
--- a/src/main/java/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java
+++ b/src/main/java/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java
@@ -23,7 +23,7 @@
  */
 package com.github.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.ParserException;
+import com.github.zafarkhaja.semver.ParseException;
 import com.github.zafarkhaja.semver.expr.Lexer.*;
 import java.util.Arrays;
 
@@ -33,7 +33,7 @@ import java.util.Arrays;
  * @author Zafar Khaja <zafarkhaja@gmail.com>
  * @since 0.7.0
  */
-public class UnexpectedTokenException extends ParserException {
+public class UnexpectedTokenException extends ParseException {
 
     /**
      * The unexpected token.
diff --git a/src/test/java/com/github/zafarkhaja/semver/VersionParserTest.java b/src/test/java/com/github/zafarkhaja/semver/VersionParserTest.java
index ac2b895..7bf40ed 100644
--- a/src/test/java/com/github/zafarkhaja/semver/VersionParserTest.java
+++ b/src/test/java/com/github/zafarkhaja/semver/VersionParserTest.java
@@ -64,7 +64,7 @@ public class VersionParserTest {
     public void shouldNotAllowDigitsInPreReleaseVersion() {
         try {
             VersionParser.parsePreRelease("alpha.01");
-        } catch (ParserException e) {
+        } catch (ParseException e) {
             return;
         }
         fail("Should not allow digits in pre-release version");
@@ -96,7 +96,7 @@ public class VersionParserTest {
     public void shouldAllowDigitsInBuildMetadata() {
         try {
             VersionParser.parseBuild("build.01");
-        } catch (ParserException e) {
+        } catch (ParseException e) {
             fail("Should allow digits in build metadata");
         }
     }