Make even more name changes