Changed internal library name to something without a hyphen.

This caused problems with macros.