Index: src/bp-core/admin/bp-core-admin-functions.php
===================================================================
--- src/bp-core/admin/bp-core-admin-functions.php	(revision 10560)
+++ src/bp-core/admin/bp-core-admin-functions.php	(working copy)
@@ -429,7 +429,7 @@
 		),
 		'2' => array(
 			'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-settings' ), 'admin.php' ) ),
-			'name' => __( 'Settings', 'buddypress' )
+			'name' => __( 'Options', 'buddypress' )
 		),
 	);
 
Index: src/bp-core/admin/bp-core-admin-settings.php
===================================================================
--- src/bp-core/admin/bp-core-admin-settings.php	(revision 10560)
+++ src/bp-core/admin/bp-core-admin-settings.php	(working copy)
@@ -279,7 +279,7 @@
 
 		<h1><?php _e( 'BuddyPress Settings', 'buddypress' ); ?> </h1>
 
-		<h2 class="nav-tab-wrapper"><?php bp_core_admin_tabs( __( 'Settings', 'buddypress' ) ); ?></h2>
+		<h2 class="nav-tab-wrapper"><?php bp_core_admin_tabs( __( 'Options', 'buddypress' ) ); ?></h2>
 
 		<form action="<?php echo esc_url( $form_action ) ?>" method="post">
 
Index: src/bp-core/classes/class-bp-admin.php
===================================================================
--- src/bp-core/classes/class-bp-admin.php	(revision 10560)
+++ src/bp-core/classes/class-bp-admin.php	(working copy)
@@ -263,8 +263,8 @@
 
 		$hooks[] = add_submenu_page(
 			$this->settings_page,
-			__( 'BuddyPress Settings', 'buddypress' ),
-			__( 'BuddyPress Settings', 'buddypress' ),
+			__( 'BuddyPress Options', 'buddypress' ),
+			__( 'BuddyPress Options', 'buddypress' ),
 			$this->capability,
 			'bp-settings',
 			'bp_core_admin_settings'