minor changes in constant names