Fixed class and module names