Added a new macro and renamed an old one.
Used macros, removed string quotes.