Renamed service modules for naming consistency.