custom domx/libion naming changes

Change-Id: I93b063fb6a6b715b42a76078b01a8d77e78d966d