Rename some functions + localization fixes