update i18n res
update service names to be more overridable
code cleaning