HDFS-2856: rename some classes