Fix old package-as-string bug.
Fixed macro name packaging.