Updating for name changes