MOTM-842: Changed tablenames to correspond with case on lab/live server