Fixing clash between class and module name