media and display: omni naming

Change-Id: Ibcbbebc9f7259d5d6e0e3476ad9c174eddf1d96c