more renamings, more fixes for non-local saves