diff --git a/source/state_representation/include/state_representation/exceptions/InvalidStateVariableException.hpp b/source/state_representation/include/state_representation/exceptions/InvalidStateVariableException.hpp
index fa819c9db..299cfc690 100644
--- a/source/state_representation/include/state_representation/exceptions/InvalidStateVariableException.hpp
+++ b/source/state_representation/include/state_representation/exceptions/InvalidStateVariableException.hpp
@@ -4,8 +4,8 @@
 #include <iostream>
 
 namespace state_representation::exceptions {
-class InvalidVariableStateException : public std::runtime_error {
+class InvalidStateVariableException : public std::runtime_error {
 public:
-  explicit InvalidVariableStateException(const std::string& msg) : runtime_error(msg) {};
+  explicit InvalidStateVariableException(const std::string& msg) : runtime_error(msg) {};
 };
 }// namespace state_representation::exceptions
diff --git a/source/state_representation/include/state_representation/space/cartesian/CartesianState.hpp b/source/state_representation/include/state_representation/space/cartesian/CartesianState.hpp
index fddc116f5..8fdee131c 100644
--- a/source/state_representation/include/state_representation/space/cartesian/CartesianState.hpp
+++ b/source/state_representation/include/state_representation/space/cartesian/CartesianState.hpp
@@ -640,13 +640,13 @@ inline state_representation::CartesianStateVariable string_to_cartesian_state_va
   } else if (case_insensitive_variable == "all") {
     return CartesianStateVariable::ALL;
   } else {
-    throw exceptions::InvalidVariableStateException("Invalid Cartesian state variable: " + variable);
+    throw exceptions::InvalidStateVariableException("Invalid Cartesian state variable: " + variable);
   }
 }
 
 /**
  * @brief Convert CartesianStateVariable to a string
- * @throws exceptions::InvalidVariableStateException
+ * @throws exceptions::InvalidStateVariableException
  * @param variable The CartesianStateVariable enum to convert
  * @return A string corresponding to the CartesianStateVariable enum
  */