Proper error naming system (updated)

Final commit added