Update and rename CharacterSetupFix to CharacterSetup