Update Constant Names

Avoids conflicts with other names. Fixes #14
Basic framework done for #15

Testing needs to be done to make sure expected results are attained.