diff --git a/doc/wiki/Ride_3d-analyis-layer.gif b/doc/wiki/Activity_3d-analyis-layer.gif
similarity index 100%
rename from doc/wiki/Ride_3d-analyis-layer.gif
rename to doc/wiki/Activity_3d-analyis-layer.gif
diff --git a/doc/wiki/Ride_3d-rotate.gif b/doc/wiki/Activity_3d-rotate.gif
similarity index 100%
rename from doc/wiki/Ride_3d-rotate.gif
rename to doc/wiki/Activity_3d-rotate.gif
diff --git a/doc/wiki/Ride_Details-Extra.jpg b/doc/wiki/Activity_Details-Extra.jpg
similarity index 100%
rename from doc/wiki/Ride_Details-Extra.jpg
rename to doc/wiki/Activity_Details-Extra.jpg
diff --git a/doc/wiki/Ride_Details-Metric.jpg b/doc/wiki/Activity_Details-Metric.jpg
similarity index 100%
rename from doc/wiki/Ride_Details-Metric.jpg
rename to doc/wiki/Activity_Details-Metric.jpg
diff --git a/doc/wiki/Ride_Details-Workout-Config.jpg b/doc/wiki/Activity_Details-Workout-Config.jpg
similarity index 100%
rename from doc/wiki/Ride_Details-Workout-Config.jpg
rename to doc/wiki/Activity_Details-Workout-Config.jpg
diff --git a/doc/wiki/Ride_Details-Workout.jpg b/doc/wiki/Activity_Details-Workout.jpg
similarity index 100%
rename from doc/wiki/Ride_Details-Workout.jpg
rename to doc/wiki/Activity_Details-Workout.jpg
diff --git a/doc/wiki/Ride_Editor-Context_1st_Column.jpg b/doc/wiki/Activity_Editor-Context_1st_Column.jpg
similarity index 100%
rename from doc/wiki/Ride_Editor-Context_1st_Column.jpg
rename to doc/wiki/Activity_Editor-Context_1st_Column.jpg
diff --git a/doc/wiki/Ride_Editor-Context_Data.jpg b/doc/wiki/Activity_Editor-Context_Data.jpg
similarity index 100%
rename from doc/wiki/Ride_Editor-Context_Data.jpg
rename to doc/wiki/Activity_Editor-Context_Data.jpg
diff --git a/doc/wiki/Ride_Editor-Context_Header_Row.jpg b/doc/wiki/Activity_Editor-Context_Header_Row.jpg
similarity index 100%
rename from doc/wiki/Ride_Editor-Context_Header_Row.jpg
rename to doc/wiki/Activity_Editor-Context_Header_Row.jpg
diff --git a/doc/wiki/Ride_Editor-Icons.jpg b/doc/wiki/Activity_Editor-Icons.jpg
similarity index 100%
rename from doc/wiki/Ride_Editor-Icons.jpg
rename to doc/wiki/Activity_Editor-Icons.jpg
diff --git a/doc/wiki/Ride_Editor-View.jpg b/doc/wiki/Activity_Editor-View.jpg
similarity index 100%
rename from doc/wiki/Ride_Editor-View.jpg
rename to doc/wiki/Activity_Editor-View.jpg
diff --git a/doc/wiki/Ride_Histogram.jpg b/doc/wiki/Activity_Histogram.jpg
similarity index 100%
rename from doc/wiki/Ride_Histogram.jpg
rename to doc/wiki/Activity_Histogram.jpg
diff --git a/doc/wiki/ChartsBar_Rides.jpg b/doc/wiki/ChartsBar_Activities.jpg
similarity index 100%
rename from doc/wiki/ChartsBar_Rides.jpg
rename to doc/wiki/ChartsBar_Activities.jpg
diff --git a/doc/wiki/ChartsBar_Rides_More.GIF b/doc/wiki/ChartsBar_Activities_More.GIF
similarity index 100%
rename from doc/wiki/ChartsBar_Rides_More.GIF
rename to doc/wiki/ChartsBar_Activities_More.GIF
diff --git a/doc/wiki/ChartsBar_Rides_More.jpg b/doc/wiki/ChartsBar_Activities_More.jpg
similarity index 100%
rename from doc/wiki/ChartsBar_Rides_More.jpg
rename to doc/wiki/ChartsBar_Activities_More.jpg
diff --git a/doc/wiki/CollectionTree_RidePopup.jpg b/doc/wiki/CollectionTree_ActivityPopup.jpg
similarity index 100%
rename from doc/wiki/CollectionTree_RidePopup.jpg
rename to doc/wiki/CollectionTree_ActivityPopup.jpg
diff --git a/doc/wiki/Distribution - Ride Data Samples.jpg b/doc/wiki/Distribution - Activity Data Samples.jpg
similarity index 100%
rename from doc/wiki/Distribution - Ride Data Samples.jpg
rename to doc/wiki/Distribution - Activity Data Samples.jpg
diff --git a/doc/wiki/Distribution - Ride Metrics.jpg b/doc/wiki/Distribution - Activity Metrics.jpg
similarity index 100%
rename from doc/wiki/Distribution - Ride Metrics.jpg
rename to doc/wiki/Distribution - Activity Metrics.jpg
diff --git a/doc/wiki/FirstSteps_YourFirstAthlete_RidesViewSplashScreen.JPG b/doc/wiki/FirstSteps_YourFirstAthlete_ActivitiesViewSplashScreen.JPG
similarity index 100%
rename from doc/wiki/FirstSteps_YourFirstAthlete_RidesViewSplashScreen.JPG
rename to doc/wiki/FirstSteps_YourFirstAthlete_ActivitiesViewSplashScreen.JPG
diff --git a/doc/wiki/MenuBar_Activity-ShareRide.jpg b/doc/wiki/MenuBar_Activity-ShareActivity.jpg
similarity index 100%
rename from doc/wiki/MenuBar_Activity-ShareRide.jpg
rename to doc/wiki/MenuBar_Activity-ShareActivity.jpg
diff --git a/doc/wiki/Share_Ride.jpg b/doc/wiki/Share_Activity.jpg
similarity index 100%
rename from doc/wiki/Share_Ride.jpg
rename to doc/wiki/Share_Activity.jpg
diff --git a/doc/wiki/SideBar_Rides-Rides_Columns.jpg b/doc/wiki/SideBar_Activities-Activities_Columns.jpg
similarity index 100%
rename from doc/wiki/SideBar_Rides-Rides_Columns.jpg
rename to doc/wiki/SideBar_Activities-Activities_Columns.jpg
diff --git a/doc/wiki/SideBar_Rides-Rides_Menu.jpg b/doc/wiki/SideBar_Activities-Activities_Menu.jpg
similarity index 100%
rename from doc/wiki/SideBar_Rides-Rides_Menu.jpg
rename to doc/wiki/SideBar_Activities-Activities_Menu.jpg
diff --git a/doc/wiki/SideBar_Rides-Intervals_Edit_Interval.jpg b/doc/wiki/SideBar_Activities-Intervals_Edit_Interval.jpg
similarity index 100%
rename from doc/wiki/SideBar_Rides-Intervals_Edit_Interval.jpg
rename to doc/wiki/SideBar_Activities-Intervals_Edit_Interval.jpg
diff --git a/doc/wiki/SideBar_Rides-Intervals_Find.jpg b/doc/wiki/SideBar_Activities-Intervals_Find.jpg
similarity index 100%
rename from doc/wiki/SideBar_Rides-Intervals_Find.jpg
rename to doc/wiki/SideBar_Activities-Intervals_Find.jpg
diff --git a/doc/wiki/SideBar_Rides-Intervals_Menu.jpg b/doc/wiki/SideBar_Activities-Intervals_Menu.jpg
similarity index 100%
rename from doc/wiki/SideBar_Rides-Intervals_Menu.jpg
rename to doc/wiki/SideBar_Activities-Intervals_Menu.jpg
diff --git a/doc/wiki/SideBar_Rides-Intervals_Multi_Select.jpg b/doc/wiki/SideBar_Activities-Intervals_Multi_Select.jpg
similarity index 100%
rename from doc/wiki/SideBar_Rides-Intervals_Multi_Select.jpg
rename to doc/wiki/SideBar_Activities-Intervals_Multi_Select.jpg
diff --git a/doc/wiki/SideBar_Rides-Intervals_Overview.jpg b/doc/wiki/SideBar_Activities-Intervals_Overview.jpg
similarity index 100%
rename from doc/wiki/SideBar_Rides-Intervals_Overview.jpg
rename to doc/wiki/SideBar_Activities-Intervals_Overview.jpg
diff --git a/doc/wiki/SideBar_Rides.JPG b/doc/wiki/SideBar_Activities.JPG
similarity index 100%
rename from doc/wiki/SideBar_Rides.JPG
rename to doc/wiki/SideBar_Activities.JPG
diff --git a/doc/wiki/SideBar_Rides_Columns_Add_Column.gif b/doc/wiki/SideBar_Activities_Columns_Add_Column.gif
similarity index 100%
rename from doc/wiki/SideBar_Rides_Columns_Add_Column.gif
rename to doc/wiki/SideBar_Activities_Columns_Add_Column.gif
diff --git a/doc/wiki/SideBar_Rides_Columns_Move_Resize.gif b/doc/wiki/SideBar_Activities_Columns_Move_Resize.gif
similarity index 100%
rename from doc/wiki/SideBar_Rides_Columns_Move_Resize.gif
rename to doc/wiki/SideBar_Activities_Columns_Move_Resize.gif
diff --git a/doc/wiki/SideBar_Rides_Intervals_Zoom.gif b/doc/wiki/SideBar_Activities_Intervals_Zoom.gif
similarity index 100%
rename from doc/wiki/SideBar_Rides_Intervals_Zoom.gif
rename to doc/wiki/SideBar_Activities_Intervals_Zoom.gif