Let's use constant uno name for these.

Change-Id: I5e34f4d7561ef7f4f7b8b3b4d7d06cca072831c7