Undo FnGetAtt rename

Change-Id: I59d1a24a51272e8ec537d8b039505a36c8c010f8