Change omni stuff to illusion

Change-Id: If648cd6a4cdb295d1f79346d927be44704df5b89