fixed names space issues