Removed _NEW suffix from header defines