Did some renaming on the data proxy classes.