Fixed issue where modules name with underscores were not being extracted
properly