Making the cmake variables more consistent.