Index: src/bp-core/bp-core-admin.php
===================================================================
--- src/bp-core/bp-core-admin.php	(revision 8638)
+++ src/bp-core/bp-core-admin.php	(working copy)
@@ -396,7 +396,7 @@
 
 		if ( ! empty( $avatar_setting ) ) {
 		    // Allow avatar uploads
-		    add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
+		    add_settings_field( 'bp-disable-avatar-uploads', __( 'Profile Photo Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
 		    register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                    );
 		}
 	}
Index: src/bp-core/bp-core-avatars.php
===================================================================
--- src/bp-core/bp-core-avatars.php	(revision 8638)
+++ src/bp-core/bp-core-avatars.php	(working copy)
@@ -300,7 +300,7 @@
 
 	// Get a fallback for the 'alt' parameter
 	if ( empty( $alt ) )
-		$alt = __( 'Avatar Image', 'buddypress' );
+		$alt = __( 'Profile Photo', 'buddypress' );
 
 	$html_alt = ' alt="' . esc_attr( $alt ) . '"';
 
@@ -844,7 +844,7 @@
 
 	// Image alt tag
 	if ( empty( $alt ) ) {
-		$alt = sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $id ) );
+		$alt = sprintf( __( 'Profile Photo of %s', 'buddypress' ), bp_core_get_user_displayname( $id ) );
 	}
 
 	// Use the 'thumb' type, unless the requested width is bigger than
Index: src/bp-core/bp-core-classes.php
===================================================================
--- src/bp-core/bp-core-classes.php	(revision 8638)
+++ src/bp-core/bp-core-classes.php	(working copy)
@@ -810,9 +810,9 @@
 		wp_cache_set( 'bp_user_email_' . $this->id, $this->email, 'bp' );
 		wp_cache_set( 'bp_user_url_' . $this->id, $this->user_url, 'bp' );
 
-		$this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ) ) );
-		$this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ) ) );
-		$this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ), 'width' => 30, 'height' => 30 ) );
+		$this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full', 'alt' => sprintf( __( 'Profile Photo of %s', 'buddypress' ), $this->fullname ) ) );
+		$this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile Photo of %s', 'buddypress' ), $this->fullname ) ) );
+		$this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile Photo of %s', 'buddypress' ), $this->fullname ), 'width' => 30, 'height' => 30 ) );
 		$this->last_active  = bp_core_get_last_activity( bp_get_user_last_activity( $this->id ), __( 'active %s', 'buddypress' ) );
 	}
 
Index: src/bp-core/bp-core-template.php
===================================================================
--- src/bp-core/bp-core-template.php	(revision 8638)
+++ src/bp-core/bp-core-template.php	(working copy)
@@ -157,7 +157,7 @@
 	global $comment;
 
 	if ( function_exists( 'bp_core_fetch_avatar' ) )
-		echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $comment->user_id ) ) ) ) );
+		echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile Photo of %s', 'buddypress' ), bp_core_get_user_displayname( $comment->user_id ) ) ) ) );
 	else if ( function_exists('get_avatar') )
 		get_avatar();
 }
@@ -173,7 +173,7 @@
 	global $post;
 
 	if ( function_exists( 'bp_core_fetch_avatar' ) )
-		echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $post->post_author ) ) ) ) );
+		echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile Photo of %s', 'buddypress' ), bp_core_get_user_displayname( $post->post_author ) ) ) ) );
 	else if ( function_exists('get_avatar') )
 		get_avatar();
 }
Index: src/bp-core/bp-core-widgets.php
===================================================================
--- src/bp-core/bp-core-widgets.php	(revision 8638)
+++ src/bp-core/bp-core-widgets.php	(working copy)
@@ -314,7 +314,7 @@
 	 */
 	function __construct() {
 		$widget_ops = array(
-			'description' => __( 'Avatars of users who are currently online', 'buddypress' ),
+			'description' => __( 'Profile Photos of online users', 'buddypress' ),
 			'classname' => 'widget_bp_core_whos_online_widget buddypress widget',
 		);
 		parent::__construct( false, $name = _x( "(BuddyPress) Who's Online", 'widget name', 'buddypress' ), $widget_ops );
@@ -417,7 +417,7 @@
 	 */
 	function __construct() {
 		$widget_ops = array(
-			'description' => __( 'Avatars of recently active members', 'buddypress' ),
+			'description' => __( 'Profile Photos of recently active members', 'buddypress' ),
 			'classname' => 'widget_bp_core_recently_active_widget buddypress widget',
 		);
 		parent::__construct( false, $name = _x( '(BuddyPress) Recently Active Members', 'widget name', 'buddypress' ), $widget_ops );
Index: src/bp-core/deprecated/2.1.php
===================================================================
--- src/bp-core/deprecated/2.1.php	(revision 8638)
+++ src/bp-core/deprecated/2.1.php	(working copy)
@@ -389,7 +389,7 @@
 
 			<?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
 
-				<li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
+				<li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Profile Photo', 'buddypress' ); ?></a></li>
 
 			<?php endif; ?>
 
@@ -512,7 +512,7 @@
 
 			<?php endif ?>
 
-			<li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
+			<li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Profile Photo", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
 
 			<li><a href="<?php bp_members_component_link( 'settings', 'capabilities' ); ?>"><?php _e( 'User Capabilities', 'buddypress' ); ?></a></li>
 
Index: src/bp-groups/bp-groups-adminbar.php
===================================================================
--- src/bp-groups/bp-groups-adminbar.php	(revision 8638)
+++ src/bp-groups/bp-groups-adminbar.php	(working copy)
@@ -61,7 +61,7 @@
 		$wp_admin_bar->add_menu( array(
 			'parent' => $bp->group_admin_menu_id,
 			'id'     => 'group-avatar',
-			'title'  => __( 'Edit Avatar', 'buddypress' ),
+			'title'  => __( 'Edit Profile Photo', 'buddypress' ),
 			'href'   =>  bp_get_groups_action_link( 'admin/group-avatar' )
 		) );
 	}
Index: src/bp-groups/bp-groups-loader.php
===================================================================
--- src/bp-groups/bp-groups-loader.php	(revision 8638)
+++ src/bp-groups/bp-groups-loader.php	(working copy)
@@ -255,7 +255,7 @@
 		// If avatar uploads are not disabled, add avatar option
 		if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
 			$this->group_creation_steps['group-avatar'] = array(
-				'name'     => __( 'Avatar',   'buddypress' ),
+				'name'     => __( 'Profile Photo',   'buddypress' ),
 				'position' => 20
 			);
 		}
@@ -584,11 +584,11 @@
 					'object'     => 'group',
 					'type'       => 'thumb',
 					'avatar_dir' => 'group-avatars',
-					'alt'        => __( 'Group Avatar', 'buddypress' )
+					'alt'        => __( 'Group Profile Photo', 'buddypress' )
 				) );
 
 				if ( empty( $bp->bp_options_avatar ) ) {
-					$bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Avatar', 'buddypress' ) . '" class="avatar" />';
+					$bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Profile Photo', 'buddypress' ) . '" class="avatar" />';
 				}
 			}
 		}
Index: src/bp-groups/bp-groups-template.php
===================================================================
--- src/bp-groups/bp-groups-template.php	(revision 8638)
+++ src/bp-groups/bp-groups-template.php	(working copy)
@@ -1560,7 +1560,7 @@
 
 	<?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
 
-		<li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
+		<li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Profile Photo', 'buddypress' ); ?></a></li>
 
 	<?php endif; ?>
 
@@ -3455,9 +3455,9 @@
 			$this->invite->user->profile_data = BP_XProfile_ProfileData::get_all_for_user( $user_id );
 		}
 
-		$this->invite->user->avatar       = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
-		$this->invite->user->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
-		$this->invite->user->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ), 'width' => 30, 'height' => 30 ) );
+		$this->invite->user->avatar       = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'alt' => sprintf( __( 'Profile Photo of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
+		$this->invite->user->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile Photo of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
+		$this->invite->user->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile Photo of %s', 'buddypress' ), $this->invite->user->fullname ), 'width' => 30, 'height' => 30 ) );
 		$this->invite->user->email        = $this->invite->user->user_email;
 		$this->invite->user->user_url     = bp_core_get_user_domain( $user_id, $this->invite->user->user_nicename, $this->invite->user->user_login );
 		$this->invite->user->user_link    = "<a href='{$this->invite->user->user_url}' title='{$this->invite->user->fullname}'>{$this->invite->user->fullname}</a>";
Index: src/bp-members/bp-members-admin.php
===================================================================
--- src/bp-members/bp-members-admin.php	(revision 8638)
+++ src/bp-members/bp-members-admin.php	(working copy)
@@ -278,7 +278,7 @@
 			case 'avatar':
 				$notice = array(
 					'class'   => 'updated',
-					'message' => __( 'Avatar was deleted successfully!', 'buddypress' )
+					'message' => __( 'Profile Photo was deleted!', 'buddypress' )
 				);
 				break;
 			case 'ham' :
Index: src/bp-members/bp-members-adminbar.php
===================================================================
--- src/bp-members/bp-members-adminbar.php	(revision 8638)
+++ src/bp-members/bp-members-adminbar.php	(working copy)
@@ -106,7 +106,7 @@
 			$wp_admin_bar->add_menu( array(
 				'parent' => $bp->user_admin_menu_id,
 				'id'     => $bp->user_admin_menu_id . '-change-avatar',
-				'title'  => __( "Edit Avatar", 'buddypress' ),
+				'title'  => __( "Edit Profile Photo", 'buddypress' ),
 				'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
 			) );
 		}
Index: src/bp-members/bp-members-template.php
===================================================================
--- src/bp-members/bp-members-template.php	(revision 8638)
+++ src/bp-members/bp-members-template.php	(working copy)
@@ -1690,7 +1690,7 @@
 		$defaults = array(
 			'size' => bp_core_avatar_full_width(),
 			'class' => 'avatar',
-			'alt' => __( 'Your Avatar', 'buddypress' )
+			'alt' => __( 'Your Profile Photo', 'buddypress' )
 		);
 
 		$r = wp_parse_args( $args, $defaults );
Index: src/bp-templates/bp-legacy/buddypress/groups/create.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/create.php	(revision 8638)
+++ src/bp-templates/bp-legacy/buddypress/groups/create.php	(working copy)
@@ -154,12 +154,12 @@
 
 				<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
 
-					<h4><?php _e( 'Crop Group Avatar', 'buddypress' ); ?></h4>
+					<h4><?php _e( 'Crop Group Profile Photo', 'buddypress' ); ?></h4>
 
-					<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
+					<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile Photo to crop', 'buddypress' ); ?>" />
 
 					<div id="avatar-crop-pane">
-						<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
+						<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile Photo preview', 'buddypress' ); ?>" />
 					</div>
 
 					<input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ); ?>" />
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin.php	(revision 8638)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin.php	(working copy)
@@ -136,7 +136,7 @@
 
 				<p><?php _e( "If you'd like to remove the existing avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p>
 
-				<?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_title' => __( 'Delete Avatar', 'buddypress' ), 'link_text' => __( 'Delete Avatar', 'buddypress' ) ) ); ?>
+				<?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_title' => __( 'Delete Profile Photo', 'buddypress' ), 'link_text' => __( 'Delete Profile Photo', 'buddypress' ) ) ); ?>
 
 			<?php endif; ?>
 
@@ -146,12 +146,12 @@
 
 	<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
 
-		<h4><?php _e( 'Crop Avatar', 'buddypress' ); ?></h4>
+		<h4><?php _e( 'Crop Profile Photo', 'buddypress' ); ?></h4>
 
-		<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
+		<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile Photo to crop', 'buddypress' ); ?>" />
 
 		<div id="avatar-crop-pane">
-			<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
+			<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile Photo preview', 'buddypress' ); ?>" />
 		</div>
 
 		<input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ); ?>" />
Index: src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php	(revision 8638)
+++ src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php	(working copy)
@@ -1,4 +1,4 @@
-<h4><?php _e( 'Change Avatar', 'buddypress' ); ?></h4>
+<h4><?php _e( 'Change Profile Photo', 'buddypress' ); ?></h4>
 
 <?php do_action( 'bp_before_profile_avatar_upload_content' ); ?>
 
@@ -21,7 +21,7 @@
 
 			<?php if ( bp_get_user_has_avatar() ) : ?>
 				<p><?php _e( "If you'd like to delete your current avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p>
-				<p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ); ?>"><?php _e( 'Delete My Avatar', 'buddypress' ); ?></a></p>
+				<p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>"><?php _e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
 			<?php endif; ?>
 
 		<?php endif; ?>
@@ -28,12 +28,12 @@
 
 		<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
 
-			<h5><?php _e( 'Crop Your New Avatar', 'buddypress' ); ?></h5>
+			<h5><?php _e( 'Crop Your New Profile Photo', 'buddypress' ); ?></h5>
 
-			<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
+			<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile Photo to crop', 'buddypress' ); ?>" />
 
 			<div id="avatar-crop-pane">
-				<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
+				<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile Photo preview', 'buddypress' ); ?>" />
 			</div>
 
 			<input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ); ?>" />
Index: src/bp-xprofile/bp-xprofile-activity.php
===================================================================
--- src/bp-xprofile/bp-xprofile-activity.php	(revision 8638)
+++ src/bp-xprofile/bp-xprofile-activity.php	(working copy)
@@ -24,7 +24,7 @@
 		'new_avatar',
 		__( 'Member changed profile picture', 'buddypress' ),
 		'bp_xprofile_format_activity_action_new_avatar',
-		__( 'Updated Avatars', 'buddypress' )
+		__( 'Updated Profile Photos', 'buddypress' )
 	);
 
 	bp_activity_set_action(
Index: src/bp-xprofile/bp-xprofile-admin.php
===================================================================
--- src/bp-xprofile/bp-xprofile-admin.php	(revision 8638)
+++ src/bp-xprofile/bp-xprofile-admin.php	(working copy)
@@ -583,7 +583,7 @@
 		// Avatar Metabox
 		add_meta_box(
 			'bp_xprofile_user_admin_avatar',
-			_x( 'Avatar', 'xprofile user-admin edit screen', 'buddypress' ),
+			_x( 'Profile Photo', 'xprofile user-admin edit screen', 'buddypress' ),
 			array( $this, 'user_admin_avatar_metabox' ),
 			$screen_id,
 			'side',
@@ -843,7 +843,7 @@
 				$community_url = add_query_arg( $query_args, buddypress()->members->admin->edit_profile_url );
 				$delete_link   = wp_nonce_url( $community_url, 'delete_avatar' ); ?>
 
-				<a href="<?php echo esc_url( $delete_link ); ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ); ?>" class="bp-xprofile-avatar-user-admin"><?php esc_html_e( 'Delete Avatar', 'buddypress' ); ?></a></li>
+				<a href="<?php echo esc_url( $delete_link ); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>" class="bp-xprofile-avatar-user-admin"><?php esc_html_e( 'Delete Profile Photo', 'buddypress' ); ?></a></li>
 
 			<?php endif; ?>
 
Index: src/bp-xprofile/bp-xprofile-loader.php
===================================================================
--- src/bp-xprofile/bp-xprofile-loader.php	(revision 8638)
+++ src/bp-xprofile/bp-xprofile-loader.php	(working copy)
@@ -208,7 +208,7 @@
 		// Change Avatar
 		if ( buddypress()->avatar->show_avatars ) {
 			$sub_nav[] = array(
-				'name'            => __( 'Change Avatar', 'buddypress' ),
+				'name'            => __( 'Change Profile Photo', 'buddypress' ),
 				'slug'            => 'change-avatar',
 				'parent_url'      => $profile_link,
 				'parent_slug'     => $this->slug,
@@ -305,7 +305,7 @@
 				$wp_admin_nav[] = array(
 					'parent' => 'my-account-' . $this->id,
 					'id'     => 'my-account-' . $this->id . '-change-avatar',
-					'title'  => __( 'Change Avatar', 'buddypress' ),
+					'title'  => __( 'Change Profile Photo', 'buddypress' ),
 					'href'   => trailingslashit( $profile_link . 'change-avatar' )
 				);
 			}
Index: src/bp-xprofile/bp-xprofile-template.php
===================================================================
--- src/bp-xprofile/bp-xprofile-template.php	(revision 8638)
+++ src/bp-xprofile/bp-xprofile-template.php	(working copy)
@@ -648,7 +648,7 @@
 	if ( !(int) $bp->site_options['bp-disable-avatar-uploads'] )
 		bp_core_avatar_admin( null, bp_loggedin_user_domain() . $bp->profile->slug . '/change-avatar/', bp_loggedin_user_domain() . $bp->profile->slug . '/delete-avatar/' );
 	else
-		_e( 'Avatar uploads are currently disabled. Why not use a <a href="http://gravatar.com" target="_blank">gravatar</a> instead?', 'buddypress' );
+		_e( 'Profile Photo uploads are currently disabled. Why not use a <a href="http://gravatar.com" target="_blank">gravatar</a> instead?', 'buddypress' );
 }
 
 function bp_profile_last_updated() {