minor modification to constant names