Sync with name changes