cleanup raw casts
rename modules

no underscores in module names