HDFS-2856: rename methods for clarity.