Some macro renaming
Resume/Pause should indicate no arguments
Changing suspend/resume to pause/unpause