Updated change of name code