Refactored the parsing module names