Improve error message & refactor reserved names