minor fiddling with names of constants