more improvements to nameing