More renaming to ADFS, added req for ADFS 3.0