fix i18n, change global names

Change-Id: Iffa9306c93e3beddc147759f280d27ccb5c10b14