Rename the remainder old names