Use CM standard qcom naming

Change-Id: I360b3dcf1fe82140a7993189e881f9d77b571bef
(cherry picked from commit 0dd3e61b5ed0cb033a4d83a20722342cbf152420)