First stage in refactoring/renaming Error hierarcy