diff --git src/bp-activity/bp-activity-admin.php src/bp-activity/bp-activity-admin.php
index 8c3408f0b..8c765f35e 100644
--- src/bp-activity/bp-activity-admin.php
+++ src/bp-activity/bp-activity-admin.php
@@ -399,7 +399,7 @@ function bp_activity_admin_load() {
 					 * which contains one of these listed keys.
 					 */
 					remove_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2 );
-					remove_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys', 2 );
+					remove_action( 'bp_activity_before_save', 'bp_activity_check_disallowed_keys', 2 );
 
 					bp_activity_mark_as_ham( $activity );
 					$result = $activity->save();
diff --git src/bp-activity/bp-activity-filters.php src/bp-activity/bp-activity-filters.php
index ce727db93..1e57372ee 100644
--- src/bp-activity/bp-activity-filters.php
+++ src/bp-activity/bp-activity-filters.php
@@ -117,7 +117,7 @@ add_action( 'bp_activity_before_save', 'bp_activity_at_name_filter_updates' );
 
 // Activity stream moderation.
 add_action( 'bp_activity_before_save', 'bp_activity_check_moderation_keys', 2, 1 );
-add_action( 'bp_activity_before_save', 'bp_activity_check_blacklist_keys',  2, 1 );
+add_action( 'bp_activity_before_save', 'bp_activity_check_disallowed_keys',  2, 1 );
 
 /** Functions *****************************************************************/
 
@@ -172,11 +172,11 @@ function bp_activity_check_moderation_keys( $activity ) {
 /**
  * Mark the posted activity as spam, if it contains disallowed keywords.
  *
- * @since 1.6.0
+ * @since 7.0.0
  *
  * @param BP_Activity_Activity $activity The activity object to check.
  */
-function bp_activity_check_blacklist_keys( $activity ) {
+function bp_activity_check_disallowed_keys( $activity ) {
 
 	// Only check specific types of activity updates.
 	if ( ! in_array( $activity->type, bp_activity_get_moderated_activity_types() ) ) {
@@ -185,9 +185,9 @@ function bp_activity_check_blacklist_keys( $activity ) {
 
 	// Send back the error so activity update fails.
 	// @todo This is temporary until some kind of trash status is built.
-	$blacklist = bp_core_check_for_blacklist( $activity->user_id, '', $activity->content, 'wp_error' );
-	if ( is_wp_error( $blacklist ) ) {
-		$activity->errors = $blacklist;
+	$disallowed = bp_core_check_for_disallowed_keys( $activity->user_id, '', $activity->content, 'wp_error' );
+	if ( is_wp_error( $disallowed ) ) {
+		$activity->errors = $disallowed;
 
 		// Backpat.
 		$activity->component = false;
diff --git src/bp-core/bp-core-moderation.php src/bp-core/bp-core-moderation.php
index 409e9082d..16e3a4ebd 100644
--- src/bp-core/bp-core-moderation.php
+++ src/bp-core/bp-core-moderation.php
@@ -187,10 +187,7 @@ function bp_core_check_for_moderation( $user_id = 0, $title = '', $content = '',
 /**
  * Check for blocked keys.
  *
- * @since 1.6.0
- * @since 2.6.0 Added $error_type parameter.
- *
- * @todo Why don't we use wp_blacklist_check() for this?
+ * @since 7.0.0
  *
  * @param int    $user_id    User ID.
  * @param string $title      The title of the content.
@@ -198,19 +195,34 @@ function bp_core_check_for_moderation( $user_id = 0, $title = '', $content = '',
  * @param string $error_type The error type to return. Either 'bool' or 'wp_error'.
  * @return bool|WP_Error True if test is passed, false if fail.
  */
-function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
+function bp_core_check_for_disallowed_keys( $user_id = 0, $title = '', $content = '', $error_type = 'bool' ) {
 
 	/**
 	 * Filters whether or not to bypass checking for blocked keys.
 	 *
 	 * @since 2.2.0
+	 * @deprecated 7.0.0 Use 'bp_bypass_check_for_disallowed_keys' instead.
+	 *
+	 * @param bool   $value   Whether or not to bypass checking. Default false.
+	 * @param int    $user_id Topic of reply author ID.
+	 * @param string $title   The title of the content.
+	 * @param string $content $the content being posted.
+	 */
+	if ( apply_filters_deprecated( 'bp_bypass_check_for_blacklist', array( false, $user_id, $title, $content ), '7.0.0', 'bp_bypass_check_for_disallowed_keys' ) ) {
+		return true;
+	}
+
+	/**
+	 * Filters whether or not to bypass checking for blocked keys.
+	 *
+	 * @since 7.0.0
 	 *
 	 * @param bool   $value   Whether or not to bypass checking. Default false.
 	 * @param int    $user_id Topic of reply author ID.
 	 * @param string $title   The title of the content.
 	 * @param string $content $the content being posted.
 	 */
-	if ( apply_filters( 'bp_bypass_check_for_blacklist', false, $user_id, $title, $content ) ) {
+	if ( apply_filters( 'bp_bypass_check_for_disallowed_keys', false, $user_id, $title, $content ) ) {
 		return true;
 	}
 
@@ -293,7 +305,7 @@ function bp_core_check_for_blacklist( $user_id = 0, $title = '', $content = '',
 				if ( 'bool' === $error_type ) {
 					return false;
 				} else {
-					return new WP_Error( 'bp_moderation_blacklist_match', _x( 'You have posted an inappropriate word.', 'Comment blacklist', 'buddypress' ) );
+					return new WP_Error( 'bp_moderation_disallowed_key_match', _x( 'You have posted an inappropriate word.', 'Comment disallowed key', 'buddypress' ) );
 				}
 			}
 		}
diff --git src/bp-groups/screens/single/admin/group-settings.php src/bp-groups/screens/single/admin/group-settings.php
index f8deb8b3f..3e9788831 100644
--- src/bp-groups/screens/single/admin/group-settings.php
+++ src/bp-groups/screens/single/admin/group-settings.php
@@ -104,4 +104,4 @@ function groups_screen_group_admin_settings() {
 	 */
 	bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/single/home' ) );
 }
-add_action( 'bp_screens', 'groups_screen_group_admin_settings' );
\ No newline at end of file
+add_action( 'bp_screens', 'groups_screen_group_admin_settings' );
diff --git src/class-buddypress.php src/class-buddypress.php
index d4610aad4..5464e5c4a 100644
--- src/class-buddypress.php
+++ src/class-buddypress.php
@@ -510,6 +510,7 @@ class BuddyPress {
 			require( $this->plugin_dir . 'bp-core/deprecated/3.0.php' );
 			require( $this->plugin_dir . 'bp-core/deprecated/4.0.php' );
 			require( $this->plugin_dir . 'bp-core/deprecated/6.0.php' );
+			require( $this->plugin_dir . 'bp-core/deprecated/7.0.php' );
 		}
 
 		// Load wp-cli module if PHP 5.4+.
