Fixed table naming in service for new db