Dev aff round3

Change the element names.