- Rename some macros.
+ Added error message functions.