Remove -_ from names for better display & matching