Consolidated naming for constants