Reduce likelihood of macro collision

[jbapple]

. . . by removing one macro and prefacing the other with the logical module it's associated with.

[coveralls]

Pull Request Test Coverage Report for Build 4029456874

• 9 of 9 (100.0%) changed or added relevant lines in 2 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 93.871%

---

Totals
Change from base Build 4027761243:	0.0%
Covered Lines:	2328
Relevant Lines:	2480

---

💛 - Coveralls

[jmalkin]

I feel like it might be worth doing this for the other macros, too?

Alternatively, would it make more sense to make this a namedspaced c++ thing?

[jbapple]

I feel like it might be worth doing this for the other macros, too?

Done.

Alternatively, would it make more sense to make this a namedspaced c++ thing?

ROTL64 and CSA (new in this commit) could be replaced by inline functions, which could be namespaced. The others cannot.

[jmalkin]

I was thinking that we could alternatively restructure as a proper C++ class, but this certainly works for now and does improve naming safety. Thank you!