Applies some naming corrections