Made exception names more consistent