Possible fix for sticky name bug. Rename some variables in Sync.