Fix Phone Settings FC

caused by this commit http://gerrit.sudoservers.com/#/c/5235/

PS2: little renaming

Change-Id: Ic1a78e5d12946130e8164adc204536c08424d5fe