Changed module names to their proper names

Previously, module names were identified using their module identifier
as opposed to their names. This has been rectified.