HDFS-5642: improve variable naming in macros.