Fixing doc comments & renaming some macros