Revamp constants

(#190) & (#168) - Do renaming of constants to make less brittle