Fixed confusion in element names

Change-Id: I1d75ce18a692af706e2a21a8015948898d14d71f