diff --git a/modules/displaytags/views/displaytags_block.html.php b/modules/displaytags/views/displaytags_block.html.php
index a003a415..e6bcef11 100644
--- a/modules/displaytags/views/displaytags_block.html.php
+++ b/modules/displaytags/views/displaytags_block.html.php
@@ -2,9 +2,9 @@
 <div class="gDisplayTagsBlock">
   <? for ($counter=0; $counter<count($tags); $counter++) { ?>
     <? if ($counter < count($tags)-1) { ?>
-      <a href="<?= url::site("tags/$tags[$counter]") ?>"><?= p::clean($tags[$counter]->name) ?></a>,
+      <a href="<?= url::site("tags/$tags[$counter]") ?>"><?= html::clean($tags[$counter]->name) ?></a>,
     <? } else {?>
-      <a href="<?= url::site("tags/$tags[$counter]") ?>"><?= p::clean($tags[$counter]->name) ?></a>
+      <a href="<?= url::site("tags/$tags[$counter]") ?>"><?= html::clean($tags[$counter]->name) ?></a>
     <? } ?>
   <? } ?>
 </div>
diff --git a/modules/latestupdates/views/updates.html.php b/modules/latestupdates/views/updates.html.php
index 07df61e5..c8fb4897 100644
--- a/modules/latestupdates/views/updates.html.php
+++ b/modules/latestupdates/views/updates.html.php
@@ -3,7 +3,7 @@
 
 <div id="gLatestUpdates">
   <h1><?= t("Latest Updates") ?></h1>
-<? array("term" => p::clean($q)) ?>
+<? array("term" => html::clean($q)) ?>
  <? if (count($items)): ?>
   <ul id="gAlbumGrid">
     <? foreach ($items as $item): ?>
@@ -15,10 +15,10 @@
       <a href="<?= url::site("items/$item->id") ?>">
         <?= $item->thumb_img() ?>
         <p>
-          <?= p::clean($item->title) ?>
+          <?= html::clean($item->title) ?>
         </p>
         <div>
-          <?= p::clean($item->description) ?>
+          <?= html::clean($item->description) ?>
         </div>
       </a>
     </li>
diff --git a/modules/metadescription/views/metadescription_block.html.php b/modules/metadescription/views/metadescription_block.html.php
index bfeacf2a..990baf71 100644
--- a/modules/metadescription/views/metadescription_block.html.php
+++ b/modules/metadescription/views/metadescription_block.html.php
@@ -5,28 +5,28 @@
   if (count($tags) > 0) {
     for ($counter=0; $counter<count($tags); $counter++) {
       if ($counter < count($tags)-1) {
-        $metaTags = $metaTags . p::clean($tags[$counter]->name) . ",";
+        $metaTags = $metaTags . html::clean($tags[$counter]->name) . ",";
       } else {
-        $metaTags = $metaTags . p::clean($tags[$counter]->name);
+        $metaTags = $metaTags . html::clean($tags[$counter]->name);
       }
     }  
   }
 
   // If $metaTags is empty, use the item's title instead.
   if ($metaTags == "") {
-    $metaTags = p::clean($item->title);
+    $metaTags = html::clean($item->title);
   }
   
   $metaDescription = "";
-  $metaDescription = trim(nl2br(p::purify($item->description)));
+  $metaDescription = trim(nl2br(html::purify($item->description)));
   // If description is empty, use title instead.
   if ($metaDescription == "") {
-    $metaDescription = p::clean($item->title);
+    $metaDescription = html::clean($item->title);
   }
   // If this page belongs to a tag, use the description of the first item instead.
   if ($theme->tag()) {
     if (count($children) > 0) {
-      $metaDescription = trim(nl2br(p::purify($children[0]->description)));
+      $metaDescription = trim(nl2br(html::purify($children[0]->description)));
     }
   }
   // If it's still empty, use $metaTags.
diff --git a/modules/tagfaces/views/drawfaces.html.php b/modules/tagfaces/views/drawfaces.html.php
index e8a50292..665f8413 100644
--- a/modules/tagfaces/views/drawfaces.html.php
+++ b/modules/tagfaces/views/drawfaces.html.php
@@ -64,14 +64,14 @@
   <div id="gAlbumHeaderButtons">
     <?= $theme->dynamic_top() ?>
   </div>
-  <h1><?= p::clean($title) ?></h1>
+  <h1><?= html::clean($title) ?></h1>
 </div>
   <p><?=t("Use the mouse to select a face on the image below."); ?></p>
 
 <fieldset> 
   <div id="gItem">
     <div id="gInfo">
-      <h2><?= p::purify($item->title) ?></h2>
+      <h2><?= html::purify($item->title) ?></h2>
     </div>
     <div id="gPhoto">
       <?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
diff --git a/modules/tagfaces/views/drawfaces_highlight_block.html.php b/modules/tagfaces/views/drawfaces_highlight_block.html.php
index a671f1f9..e88adf51 100644
--- a/modules/tagfaces/views/drawfaces_highlight_block.html.php
+++ b/modules/tagfaces/views/drawfaces_highlight_block.html.php
@@ -83,7 +83,11 @@
     foreach ($existingFaces as $oneFace) {
       $oneTag = ORM::factory("tag", $oneFace->tag_id)
 ?>
+<<<<<<< HEAD:modules/tagfaces/views/drawfaces_highlight_block.html.php
   <area shape="rect" coords="<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>" href="<?=url::site("tags/$oneFace->tag_id") ?>" title="<?=p::clean($oneTag->name); ?>" alt="<?=p::clean($oneTag->name); ?>" onMouseOver="highlightbox(<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>,'<?=p::clean($oneTag->name); ?>', '<?=p::clean($oneFace->description); ?>', '<?=url::site("tags/$oneFace->tag_id") ?>')" />
+=======
+  <area shape="rect" coords="<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>" href="<?=url::site("tags/$oneFace->tag_id") ?>" title="<?=html::clean($oneTag->name); ?>" alt="<?=$oneTag->name; ?>" onMouseOver="highlightbox(<?=$oneFace->x1 ?>,<?=$oneFace->y1 ?>,<?=$oneFace->x2 ?>,<?=$oneFace->y2 ?>,'<?=html::clean($oneTag->name); ?>')" onMouseOut="hidebox()" />
+>>>>>>> gallery3-contrib/master:modules/tagfaces/views/drawfaces_highlight_block.html.php
 <? } ?>
 
 <?
diff --git a/modules/tagsmap/views/admin_tagsmap.html.php b/modules/tagsmap/views/admin_tagsmap.html.php
index 4d79a17a..3136e35a 100644
--- a/modules/tagsmap/views/admin_tagsmap.html.php
+++ b/modules/tagsmap/views/admin_tagsmap.html.php
@@ -42,7 +42,7 @@
           <? endif ?>
 
           <li>
-            <?= p::clean($tag->name) ?>
+            <?= html::clean($tag->name) ?>
             <span class="understate">(<?= $tag->count ?>)</span>
 
             <a href="<?= url::site("admin/tagsmap/edit_gps/$tag->id") ?>"><?= t("Edit GPS") ?></a>