issue #328, fixed save/load of local names
resolved merge conflict by rebuilding