5 files changed, 9 insertions, 10 deletions
diff --git a/lib/postrunner/FFS_Activity.rb b/lib/postrunner/FFS_Activity.rb
index 138912f..79a6150 100644
--- a/lib/postrunner/FFS_Activity.rb
+++ b/lib/postrunner/FFS_Activity.rb
@@ -96,9 +96,8 @@ module PostRunner
       'all' => 'All'
     }
 
-    po_attr :device, :fit_file_name, :norecord, :name, :note, :sport,
-            :sub_sport, :timestamp, :total_distance, :total_timer_time,
-            :avg_speed
+    attr_persist :device, :fit_file_name, :norecord, :name, :note, :sport,
+      :sub_sport, :timestamp, :total_distance, :total_timer_time, :avg_speed
     attr_reader :fit_activity
 
     # Create a new FFS_Activity object.
diff --git a/lib/postrunner/FFS_Device.rb b/lib/postrunner/FFS_Device.rb
index 7306b59..06e1fc8 100644
--- a/lib/postrunner/FFS_Device.rb
+++ b/lib/postrunner/FFS_Device.rb
@@ -23,7 +23,7 @@ module PostRunner
   # dashes. All objects are transparently stored in the PEROBS::Store.
   class FFS_Device < PEROBS::Object
 
-    po_attr :activities, :monitorings, :short_uid, :long_uid
+    attr_persist :activities, :monitorings, :short_uid, :long_uid
 
     # Create a new FFS_Device object.
     # @param p [PEROBS::Handle] p
diff --git a/lib/postrunner/FFS_Monitoring.rb b/lib/postrunner/FFS_Monitoring.rb
index ce518c0..98d2f50 100644
--- a/lib/postrunner/FFS_Monitoring.rb
+++ b/lib/postrunner/FFS_Monitoring.rb
@@ -21,7 +21,7 @@ module PostRunner
 
     include DirUtils
 
-    po_attr :device, :fit_file_name, :name, :period_start, :period_end
+    attr_persist :device, :fit_file_name, :name, :period_start, :period_end
 
     # Create a new FFS_Monitoring object.
     # @param p [PEROBS::Handle] PEROBS handle
diff --git a/lib/postrunner/FitFileStore.rb b/lib/postrunner/FitFileStore.rb
index 2376f71..981da6d 100644
--- a/lib/postrunner/FitFileStore.rb
+++ b/lib/postrunner/FitFileStore.rb
@@ -29,7 +29,7 @@ module PostRunner
 
     include DirUtils
 
-    po_attr :devices
+    attr_persist :devices
 
     attr_reader :store, :views
 
diff --git a/lib/postrunner/PersonalRecords.rb b/lib/postrunner/PersonalRecords.rb
index 8dfcf7e..4b158fd 100644
--- a/lib/postrunner/PersonalRecords.rb
+++ b/lib/postrunner/PersonalRecords.rb
@@ -72,7 +72,7 @@ module PostRunner
       }
     }
 
-    po_attr :sport_records
+    attr_persist :sport_records
 
     class ActivityResult
 
@@ -94,7 +94,7 @@ module PostRunner
 
       include Fit4Ruby::Converters
 
-      po_attr :activity, :sport, :distance, :duration, :start_time
+      attr_persist :activity, :sport, :distance, :duration, :start_time
 
       def initialize(p, result)
         super(p)
@@ -123,7 +123,7 @@ module PostRunner
 
       include Fit4Ruby::Converters
 
-      po_attr :sport, :year, :distance_record, :speed_records
+      attr_persist :sport, :year, :distance_record, :speed_records
 
       def initialize(p, sport, year)
         super(p)
@@ -246,7 +246,7 @@ module PostRunner
 
     class SportRecords < PEROBS::Object
 
-      po_attr :sport, :all_time, :yearly
+      attr_persist :sport, :all_time, :yearly
 
       def initialize(p, sport)
         super(p)