Fixed error types
Moved error types back (changed casing)
Changed error types casing