change macro to not conflict with other names