renaming fixes + merge aali's locale stuff