custom domx/libion naming changes

Change-Id: Iff9bfb3f74883e067f321aeab1c602555089c57c