diff --git a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.module b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.module
index c4551e6624b4330b416748a355817bcf1e7446c5..45ca33d2923da54f969d2c33d4207096251081c4 100644
--- a/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.module
+++ b/profiles/wcm_base/modules/custom/ocio_faqs/ocio_faqs.module
@@ -109,7 +109,7 @@ function ocio_faqs_preprocess_panels_pane(&$vars) {
   $pane = $vars['pane'];
 
   if (!empty($pane->subtype) && in_array($pane->subtype, array('faq-panel_pane_1', 'faq-panel_pane_2'))) {
-    $vars['title_attributes_array']['id'][0] = 'faq-set-' . drupal_html_class($vars['title']);
+    $vars['title_attributes_array']['id'][0] = drupal_html_class($vars['title']);
   }
 }
 
@@ -125,12 +125,12 @@ function ocio_faqs_preprocess_views_view_fields(&$vars) {
 
     // Anchor tags for list and accordion panes/pages
     if (in_array($view->current_display, array('panel_pane_1', 'panel_pane_2', 'page', 'page_2'))) {
-      $vars['fields']['title']->wrapper_prefix .= '<span id="faq-' . drupal_html_class($vars['fields']['title']->raw) . '">';
+      $vars['fields']['title']->wrapper_prefix .= '<span id="' . drupal_html_class($vars['fields']['title']->raw) . '">';
       $vars['fields']['title']->wrapper_suffix = '</span>' . $vars['fields']['title']->wrapper_suffix;
     }
     // Anchor links for table of contents panes and attachments
     elseif (in_array($view->current_display, array('panel_pane_3', 'attachment_1'))) {
-      $vars['fields']['title']->wrapper_prefix .= '<a href="#faq-' . drupal_html_class($vars['fields']['title']->raw) . '">';
+      $vars['fields']['title']->wrapper_prefix .= '<a href="#' . drupal_html_class($vars['fields']['title']->raw) . '">';
       $vars['fields']['title']->wrapper_suffix = '</a>' . $vars['fields']['title']->wrapper_suffix;
     }
   }