Use varying aElement name

Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4