Applied renaming for UserChoice