Test a better naming scheme for SU

Change-Id: I27635be7f09bec6a72651b263547765e9455e984
KOT49E

Change-Id: I71ceb6a2f18fc2b2a494514566ba8d07d96f5738