Fix typo

Change-Id: Id4d11b4712240797ee7313a4e1d81fab9f01215a
Clean up names processing for quantum SG impl

Change-Id: Ib74cb6c994581ed85ea358082a92cbcf872ffde3