Improve error reporting
Rename Used in Multiple Manuals