make names of data container classes consistent