Adjusted the names of data structures.