Renamed solution files and hardened AAT's