tweaks: rename three constants, for clarity, and hardcode two others
5 files changed