Rename vertices to points for consistency?