Renamed some modules for consistency and clarity.