diff --git a/readme.txt b/readme.txt
index 17b5585..2d290da 100755
--- a/readme.txt
+++ b/readme.txt
@@ -103,6 +103,9 @@ On the WP-Strava settings page you cannot currently remove and add another athle
 
 == Changelog ==
 
+= 2.3.0 =
+Renamed LatestActivities classes to ActivitiesList.
+
 = 2.2.0 =
 Added rudimentary gutenberg block for single Activity.
 Changed all Strava links to HTTPS.
diff --git a/src/WPStrava.php b/src/WPStrava.php
index 66e7fe6..5b8c18b 100644
--- a/src/WPStrava.php
+++ b/src/WPStrava.php
@@ -166,7 +166,7 @@ class WPStrava {
 	 * Register the widgets.
 	 */
 	public function register_widgets() {
-		register_widget( 'WPStrava_LatestActivitiesWidget' );
+		register_widget( 'WPStrava_ActivitiesListWidget' );
 		register_widget( 'WPStrava_LatestMapWidget' );
 	}
 
@@ -176,7 +176,7 @@ class WPStrava {
 	public function register_shortcodes() {
 		// Initialize short code classes.
 		new WPStrava_ActivityShortcode();
-		new WPStrava_LatestActivitiesShortcode();
+		new WPStrava_ActivitiesListShortcode();
 		new WPStrava_RouteShortcode();
 		new WPStrava_LatestMapShortcode();
 	}
diff --git a/src/WPStrava/LatestActivities.php b/src/WPStrava/ActivitiesList.php
similarity index 93%
rename from src/WPStrava/LatestActivities.php
rename to src/WPStrava/ActivitiesList.php
index 3a96618..807f922 100644
--- a/src/WPStrava/LatestActivities.php
+++ b/src/WPStrava/ActivitiesList.php
@@ -1,6 +1,16 @@
 <?php
+/**
+ * Activities List.
+ * @package WPStrava
+ */
 
-class WPStrava_LatestActivities {
+/**
+ * Activities List class for shortcode and widget.
+ *
+ * @author Justin Foell <justin@foell.org>
+ * @since  2.3.0
+ */
+class WPStrava_ActivitiesList {
 	public static function get_activities_html( $args ) {
 		if ( isset( $args['athlete_token'] ) ) {
 			// Translators: Message shown when using deprecated athlete_token parameter.
diff --git a/src/WPStrava/LatestActivitiesShortcode.php b/src/WPStrava/ActivitiesListShortcode.php
similarity index 90%
rename from src/WPStrava/LatestActivitiesShortcode.php
rename to src/WPStrava/ActivitiesListShortcode.php
index db24387..2fa13d4 100644
--- a/src/WPStrava/LatestActivitiesShortcode.php
+++ b/src/WPStrava/ActivitiesListShortcode.php
@@ -8,9 +8,9 @@
  * Latest Activities Shortcode class (converted from LatestRides).
  *
  * @author Justin Foell <justin@foell.org>
- * @since  1.3.0
+ * @since  2.3.0
  */
-class WPStrava_LatestActivitiesShortcode {
+class WPStrava_ActivitiesListShortcode {
 
 	/**
 	 * Whether or not to enqueue styles (if shortcode is present).
@@ -44,7 +44,7 @@ class WPStrava_LatestActivitiesShortcode {
 	 */
 	public function handler( $atts ) {
 		$this->add_script = true;
-		return WPStrava_LatestActivities::get_activities_html( $atts );
+		return WPStrava_ActivitiesList::get_activities_html( $atts );
 	}
 
 	/**
diff --git a/src/WPStrava/LatestActivitiesWidget.php b/src/WPStrava/ActivitiesListWidget.php
similarity index 88%
rename from src/WPStrava/LatestActivitiesWidget.php
rename to src/WPStrava/ActivitiesListWidget.php
index 06b489a..e6087d0 100644
--- a/src/WPStrava/LatestActivitiesWidget.php
+++ b/src/WPStrava/ActivitiesListWidget.php
@@ -1,16 +1,27 @@
 <?php
+/**
+ *
+ */
 
 /**
  * WP Strava Latest Activities Widget Class
  */
-class WPStrava_LatestActivitiesWidget extends WP_Widget {
+
+
+/**
+ * Activities List Widget class.
+ *
+ * @author Justin Foell <justin@foell.org>
+ * @since  2.3.0
+ */
+class WPStrava_ActivitiesListWidget extends WP_Widget {
 
 	public function __construct() {
 		$widget_ops = array(
-			'classname'   => 'LatestActivitiesWidget',
-			'description' => __( 'Will show your latest activities from strava.com.', 'wp-strava' ),
+			'classname'   => 'wp-strava-activities-list-widget',
+			'description' => __( 'Show a list of activities from strava.com.', 'wp-strava' ),
 		);
-		parent::__construct( 'wp-strava', __( 'Strava Latest Activities List', 'wp-strava' ), $widget_ops );
+		parent::__construct( 'wp-strava', __( 'Strava Activities List', 'wp-strava' ), $widget_ops );
 		add_action( 'wp_enqueue_scripts', array( $this, 'maybe_enqueue' ) );
 	}
 
@@ -35,7 +46,7 @@ class WPStrava_LatestActivitiesWidget extends WP_Widget {
 		if ( $title ) {
 			echo $args['before_title'] . $title . $args['after_title'];
 		}
-		echo WPStrava_LatestActivities::get_activities_html( $activities_args );
+		echo WPStrava_ActivitiesList::get_activities_html( $activities_args );
 		echo $args['after_widget'];
 		// phpcs:enable WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
@@ -83,4 +94,4 @@ class WPStrava_LatestActivitiesWidget extends WP_Widget {
 		<?php
 	}
 
-} // class LatestActivitiesWidget
+}