7 files changed, 4 insertions, 4 deletions
diff --git a/views/default/friends/collection.php b/views/default/core/friends/collection.php
index 665e6d34d..9463d5b42 100644
--- a/views/default/friends/collection.php
+++ b/views/default/core/friends/collection.php
@@ -35,9 +35,9 @@ echo " (<span id=\"friends_membership_count{$vars['friendspicker']}\">{$count}</
 
 // individual collection panels
 if ($friends = $vars['collection']->entities) {
-	$content = elgg_view('friends/collectiontabs', array('owner' => get_loggedin_user(), 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker']));
+	$content = elgg_view('core/friends/collectiontabs', array('owner' => get_loggedin_user(), 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker']));
 
-	echo elgg_view('friends/picker',array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker']));
+	echo elgg_view('core/friends/picker', array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker']));
 	?>
 
 	<script type="text/javascript">
diff --git a/views/default/friends/collections.php b/views/default/core/friends/collections.php
index d0669bb46..6554059b1 100644
--- a/views/default/friends/collections.php
+++ b/views/default/core/friends/collections.php
@@ -19,7 +19,7 @@ if (is_array($vars['collections']) && sizeof($vars['collections'])) {
 
 	foreach($vars['collections'] as $collection) {
 		$friendspicker++;
-		echo elgg_view('friends/collection',array('collection' => $collection, 'friendspicker' => $friendspicker));
+		echo elgg_view('core/friends/collection', array('collection' => $collection, 'friendspicker' => $friendspicker));
 	}
 
 	echo "</ul>";
diff --git a/views/default/friends/collectiontabs.php b/views/default/core/friends/collectiontabs.php
index 6aef4bf1e..6aef4bf1e 100644
--- a/views/default/friends/collectiontabs.php
+++ b/views/default/core/friends/collectiontabs.php
diff --git a/views/default/friends/picker.php b/views/default/core/friends/picker.php
index 3bbe4ffe2..3bbe4ffe2 100644
--- a/views/default/friends/picker.php
+++ b/views/default/core/friends/picker.php
diff --git a/views/default/friends/tablelist.php b/views/default/core/friends/tablelist.php
index 12a0763c9..12a0763c9 100644
--- a/views/default/friends/tablelist.php
+++ b/views/default/core/friends/tablelist.php
diff --git a/views/default/friends/tablelistcountupdate.php b/views/default/core/friends/tablelistcountupdate.php
index 8e2ab637d..8e2ab637d 100644
--- a/views/default/friends/tablelistcountupdate.php
+++ b/views/default/core/friends/tablelistcountupdate.php
diff --git a/views/default/forms/friends/edit.php b/views/default/forms/friends/edit.php
index 632268fb8..16bb32fd9 100644
--- a/views/default/forms/friends/edit.php
+++ b/views/default/forms/friends/edit.php
@@ -41,7 +41,7 @@ if($vars['collection_members']){
 $form_body .= "</p>";
 
 $form_body .= "<p><label>" . elgg_echo("friends:addfriends") . "</label>".
-			elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</p>";
+			elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</p>";
 
 $form_body .= "<p>";
 if (isset($vars['collection'])) {