cleanup, refactored module names