Renamed modules to have a consistent naming convetion.