Rename constants, add new constants for better code reuse.