Update data models to use Android conventional names