Rename Shape ShapesRow, and create a ShapesTable to store the ShapesRows.
Rename Stop StopsRow, and create a StopsTable to store the StopsRows.