change class/method names to allow '_'