Fixed minor issues with misnamed modules