Code style and module name convention adjusts.