custom domx/libion naming changes

Change-Id: I368e9067c9a2705b146925357a4de971b647f04a