Fix layout and module name