First half of case fix to module names.
Second half of module case renaming
Disabled broken test.