Few remaining naming and style changes