Add Cluster function figure and rename thrift file and class name (#6481)