Index: bp-activity.php
===================================================================
--- bp-activity.php	(revision 3530)
+++ bp-activity.php	(working copy)
@@ -742,7 +742,7 @@
 	) );
 
 	/* Add this update to the "latest update" usermeta so it can be fetched anywhere. */
-	update_user_meta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
+	update_user_meta( $bp->loggedin_user->id, $bp->user_latest_update_key, array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
 
  	/* Require the notifications code so email notifications can be set on the 'bp_activity_posted_update' action. */
 	require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-notifications.php' );
@@ -869,10 +869,10 @@
 	else
 		$user_id = $args['user_id'];
 
-	$latest_update = get_user_meta( $user_id, 'bp_latest_update', true );
+	$latest_update = get_user_meta( $user_id, $bp->user_latest_update_key, true );
 	if ( !empty( $latest_update ) ) {
 		if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) )
-			delete_user_meta( $user_id, 'bp_latest_update' );
+			delete_user_meta( $user_id, $bp->user_latest_update_key );
 	}
 
 	do_action( 'bp_activity_delete', $args );
@@ -1032,14 +1032,14 @@
 }
 
 function bp_activity_get_user_favorites( $user_id ) {
-	$my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
+	$my_favs = maybe_unserialize( get_user_meta( $user_id, $bp->user_favorite_activities_key, true ) );
 	$existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) );
 
 	foreach( (array)$existing_favs['activities'] as $fav )
 		$new_favs[] = $fav->id;
 
 	$new_favs = array_unique( (array)$new_favs );
-	update_user_meta( $user_id, 'bp_favorite_activities', $new_favs );
+	update_user_meta( $user_id, $bp->user_favorite_activities_key, $new_favs );
 
 	return apply_filters( 'bp_activity_get_user_favorites', $new_favs );
 }
@@ -1051,7 +1051,7 @@
 		$user_id = $bp->loggedin_user->id;
 
 	/* Update the user's personal favorites */
-	$my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) );
+	$my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, $bp->user_favorite_activities_key, true ) );
 	$my_favs[] = $activity_id;
 
 	/* Update the total number of users who have favorited this activity */
@@ -1062,7 +1062,7 @@
 	else
 		$fav_count = 1;
 
-	update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs );
+	update_user_meta( $bp->loggedin_user->id, $bp->user_favorite_activities_key, $my_favs );
 	bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count );
 
 	do_action( 'bp_activity_add_user_favorite', $activity_id, $user_id );
@@ -1077,7 +1077,7 @@
 		$user_id = $bp->loggedin_user->id;
 
 	/* Remove the fav from the user's favs */
-	$my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) );
+	$my_favs = maybe_unserialize( get_user_meta( $user_id, $bp->user_favorite_activities_key, true ) );
 	$my_favs = array_flip( (array) $my_favs );
 	unset( $my_favs[$activity_id] );
 	$my_favs = array_unique( array_flip( $my_favs ) );
@@ -1090,7 +1090,7 @@
 		bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count );
 	}
 
-	update_user_meta( $user_id, 'bp_favorite_activities', $my_favs );
+	update_user_meta( $user_id, $bp->user_favorite_activities_key, $my_favs );
 
 	do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id );
 
@@ -1212,8 +1212,8 @@
 	bp_activity_delete( array( 'user_id' => $user_id ) );
 
 	// Remove any usermeta
-	delete_user_meta( $user_id, 'bp_latest_update' );
-	delete_user_meta( $user_id, 'bp_favorite_activities' );
+	delete_user_meta( $user_id, $bp->user_latest_update_key );
+	delete_user_meta( $user_id, $bp->user_favorite_activities_key );
 
 	do_action( 'bp_activity_remove_data', $user_id );
 }
Index: bp-activity/bp-activity-templatetags.php
===================================================================
--- bp-activity/bp-activity-templatetags.php	(revision 3530)
+++ bp-activity/bp-activity-templatetags.php	(working copy)
@@ -842,7 +842,7 @@
 		if ( !$user_id )
 			$user_id = $bp->displayed_user->id;
 
-		if ( !$update = get_user_meta( $user_id, 'bp_latest_update', true ) )
+		if ( !$update = get_user_meta( $user_id, $bp->user_latest_update_key, true ) )
 			return false;
 
 		$latest_update = '&quot;' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 40 ) ) ) ) . '&quot;';
Index: bp-core.php
===================================================================
--- bp-core.php	(revision 3530)
+++ bp-core.php	(working copy)
@@ -73,6 +73,8 @@
 
 	// Get the base database prefix
 	$bp->table_prefix = bp_core_get_table_prefix();
+	$bp->user_latest_update_key = $bp->table_prefix . 'latest_update';
+	$bp->user_favorite_activities_key = $bp->table_prefix . 'favorite_activities';
 
 	// The domain for the root of the site where the main blog resides
 	$bp->root_domain = bp_core_get_root_domain();
@@ -2153,4 +2155,4 @@
 
 	bp_core_update_page_meta( $page_ids );
 }
-?>
\ No newline at end of file
+?>
