fix constant names to match scala convention