Fixed Embarrassing Cancel bug with the naming and renaming.