Rename the various error macros

They now all end in _ERROR

Some of them were renamed to better reflect how they are actually used.