Module pattern, naming fixes