Index: bp-core/bp-core-filters.php
===================================================================
--- bp-core/bp-core-filters.php
+++ bp-core/bp-core-filters.php
@@ -299,7 +299,7 @@ function bp_modify_page_title( $title, $sep, $seplocation ) {
 		if ( !bp_current_component() )
 			$title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug( bp_members_slug() ) );
 		else
-			$title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug() );
+			$title = sprintf( __( '%s Directory', 'buddypress' ), bp_get_name_from_root_slug( bp_get_root_slug() ) );
 
 	// Sign up page
 	} elseif ( bp_is_register_page() ) {
Index: bp-core/bp-core-template.php
===================================================================
--- bp-core/bp-core-template.php
+++ bp-core/bp-core-template.php
@@ -652,11 +652,10 @@ function bp_root_slug( $component = '' ) {
 
 		// Component is active
 		if ( !empty( $bp->active_components[$component] ) ) {
-			$component_name = $bp->active_components[$component];
 
 			// Component has specific root slug
-			if ( !empty( $bp->{$component_name}->root_slug ) ) {
-				$root_slug = $bp->{$component_name}->root_slug;
+			if ( !empty( $bp->{$component}->root_slug ) ) {
+				$root_slug = $bp->{$component}->root_slug;
 			}
 		}