change macro/function definitions to avoid name conflicts