Fixes and more renaming for AD sync