checked and refactored naming conventions on other modules