custom domx/libion naming changes

Change-Id: I1b67a0e3ce1f61ca671f011e0cbc5cbaf0543fe0