Fix constant naming to better match standard storm naming conventions.