Also, please add a docstring to change_type_names explaining why we need this. Otherwise I fear we'll forget down the line why we did this.