Rename macro and use the right peek