Replaced hard-coded names with macros.
Updated function descriptions.