Rename `mesh` to `geometry`.  In general, we are working to do this throughout.