Renamed exceptions so they match our convention