Fix "-" seperator problem

fix "-" and "--" in class names problem