Merge "Rename dump methods to dumpState"