Fix Names and Codes