Refactored module names and added placeholders.