Renamed db related variables to data