Fixed inconsistencies in plural and singular forms used in module names