Adopt name changes