modify prop naming scheme to include the EOS

Change-Id: I7ef356d25b8ae5d11baae858476e4ed0cbbd11d7