fixes for replacing underscores in action names