Further unification of cmake names and configuration constants