Renamed ScopeGuard macros