[refactor] renamed error messages classes and pointing to the correct
error class where it is needed