More exception cleanup and renaming