Step one of name fix
Step two of name fix