diff --git a/src/soca/AnalyticInit/AnalyticInit.cc b/src/soca/AnalyticInit/AnalyticInit.cc
index e0eb84f52..56beb04bb 100644
--- a/src/soca/AnalyticInit/AnalyticInit.cc
+++ b/src/soca/AnalyticInit/AnalyticInit.cc
@@ -13,7 +13,7 @@ namespace soca {
   static oops::AnalyticInitMaker<ufo::ObsTraits, AnalyticInit>
     makerAnalyticInit_("soca_ana_init");
 
-  void AnalyticInit::fillGeoVaLs(const ufo::Locations & locs,
+  void AnalyticInit::fillGeoVaLs(const ufo::SampledLocations & locs,
                                  ufo::GeoVaLs & geovals) const {
     soca_analytic_geovals_f90(geovals.toFortran(), locs);
   }
diff --git a/src/soca/AnalyticInit/AnalyticInit.h b/src/soca/AnalyticInit/AnalyticInit.h
index b93d1e242..d872ca073 100644
--- a/src/soca/AnalyticInit/AnalyticInit.h
+++ b/src/soca/AnalyticInit/AnalyticInit.h
@@ -28,7 +28,7 @@ namespace soca {
     typedef AnalyticInitParameters Parameters_;
 
     explicit AnalyticInit(const Parameters_ &) {}
-    void fillGeoVaLs(const ufo::Locations &, ufo::GeoVaLs &) const override;
+    void fillGeoVaLs(const ufo::SampledLocations &, ufo::GeoVaLs &) const override;
   };
 
 }  // namespace soca
diff --git a/src/soca/AnalyticInit/AnalyticInitFortran.h b/src/soca/AnalyticInit/AnalyticInitFortran.h
index 95af90462..e0ae32c0a 100644
--- a/src/soca/AnalyticInit/AnalyticInitFortran.h
+++ b/src/soca/AnalyticInit/AnalyticInitFortran.h
@@ -12,13 +12,13 @@
 
 // Forward declarations
 namespace ufo {
-  class Locations;
+  class SampledLocations;
 }
 
 namespace soca {
 
   extern "C" {
-    void soca_analytic_geovals_f90(F90goms &, const ufo::Locations &);
+    void soca_analytic_geovals_f90(F90goms &, const ufo::SampledLocations &);
   }
 }  // namespace soca
 #endif  // SOCA_ANALYTICINIT_ANALYTICINITFORTRAN_H_
diff --git a/src/soca/AnalyticInit/soca_analytic.interface.F90 b/src/soca/AnalyticInit/soca_analytic.interface.F90
index 9242d8362..cbc796807 100644
--- a/src/soca/AnalyticInit/soca_analytic.interface.F90
+++ b/src/soca/AnalyticInit/soca_analytic.interface.F90
@@ -11,7 +11,7 @@ module soca_analytic_mod_c
 
 USE ufo_geovals_mod,            ONLY : ufo_geovals
 USE ufo_geovals_mod_c,          ONLY : ufo_geovals_registry
-USE ufo_locations_mod,          ONLY : ufo_locations
+USE ufo_sampled_locations_mod,  ONLY : ufo_sampled_locations
 
 use soca_analytic_mod
 
@@ -28,13 +28,13 @@ subroutine soca_analytic_geovals_c(c_key_geovals, c_locs) &
     type(c_ptr), value, intent(in) :: c_locs
 
     type(ufo_geovals), pointer :: geovals
-    type(ufo_locations) :: locs
+    type(ufo_sampled_locations) :: locs
 
     call ufo_geovals_registry%get(c_key_geovals, geovals)
-    locs = ufo_locations(c_locs)
+    locs = ufo_sampled_locations(c_locs)
 
     call soca_analytic_geovals(geovals, locs)
 
 end subroutine
 
-end module
\ No newline at end of file
+end module
diff --git a/src/soca/AnalyticInit/soca_analytic_mod.F90 b/src/soca/AnalyticInit/soca_analytic_mod.F90
index 2d5efd296..1f34042d8 100644
--- a/src/soca/AnalyticInit/soca_analytic_mod.F90
+++ b/src/soca/AnalyticInit/soca_analytic_mod.F90
@@ -8,7 +8,7 @@ module soca_analytic_mod
 
 use kinds, only : kind_real
 use ufo_geovals_mod, only : ufo_geovals
-use ufo_locations_mod, only : ufo_locations
+use ufo_sampled_locations_mod, only : ufo_sampled_locations
 use soca_state_mod, only : soca_state
 
 
@@ -26,21 +26,21 @@ module soca_analytic_mod
 !! \see soca_analytic_val
 subroutine soca_analytic_geovals(geovals, locs)
     type(ufo_geovals), intent(inout) :: geovals  !< output geovals
-    type(ufo_locations),  intent(in) :: locs !< input locations
+    type(ufo_sampled_locations),  intent(in) :: locs !< input locations
 
     real(kind=kind_real), allocatable :: lons(:), lats(:)
     integer :: ivar, iloc, ival
     real(kind=kind_real) :: val
     character(len=:), allocatable :: name
 
-    allocate(lons(locs%nlocs()))
-    allocate(lats(locs%nlocs()))
+    allocate(lons(locs%npaths()))
+    allocate(lats(locs%npaths()))
     call locs%get_lons(lons)
     call locs%get_lats(lats)
 
     do ivar = 1, geovals%nvar
         name = geovals%variables(ivar)
-        do iloc = 1, geovals%geovals(ivar)%nlocs
+        do iloc = 1, geovals%geovals(ivar)%nprofiles
             do ival = 1, geovals%geovals(ivar)%nval
                 val = soca_analytic_val(&
                     name, lats(iloc), lons(iloc), ival*1.0_kind_real)
diff --git a/src/soca/Increment/Increment.cc b/src/soca/Increment/Increment.cc
index 3229864e6..335a8ce84 100755
--- a/src/soca/Increment/Increment.cc
+++ b/src/soca/Increment/Increment.cc
@@ -28,7 +28,6 @@
 #include "oops/util/Logger.h"
 
 #include "ufo/GeoVaLs.h"
-#include "ufo/Locations.h"
 
 using oops::Log;
 
diff --git a/src/soca/Increment/Increment.h b/src/soca/Increment/Increment.h
index 4de6d37ec..4c4df95df 100644
--- a/src/soca/Increment/Increment.h
+++ b/src/soca/Increment/Increment.h
@@ -36,7 +36,6 @@ namespace eckit {
 }
 namespace ufo {
   class GeoVaLs;
-  class Locations;
 }
 namespace soca {
   class Geometry;
diff --git a/src/soca/State/State.cc b/src/soca/State/State.cc
index 2dcaa9000..444bf43b7 100644
--- a/src/soca/State/State.cc
+++ b/src/soca/State/State.cc
@@ -23,7 +23,6 @@
 #include "oops/util/Logger.h"
 
 #include "ufo/GeoVaLs.h"
-#include "ufo/Locations.h"
 
 using oops::Log;
 
diff --git a/src/soca/State/State.h b/src/soca/State/State.h
index 056c0e742..b2fdc83e1 100644
--- a/src/soca/State/State.h
+++ b/src/soca/State/State.h
@@ -27,7 +27,6 @@ namespace eckit {
 }
 namespace ufo {
   class GeoVaLs;
-  class Locations;
 }
 namespace soca {
   class Geometry;