Bug 840790 - [B2G][First Time User]Wrong or Modified names for various locations

Totally 11 changes. 10 insertions and 1 deletion