Clear up const naming