Renamed macro.
Fixed merge conflict.