Some minor naming + CS fixes