Make next name change easier, intern strings