diff --git a/bmtabs.module b/bmtabs.module
index e654200..39389ea 100755
--- a/bmtabs.module
+++ b/bmtabs.module
@@ -297,12 +297,12 @@ function bmtabs_get_build_mode_tab_title($node, $mode, $title) {
   $variable = variable_get('bmtabs_build_mode_rename', null);
 
   // Before we get funky, let's do a simple search for this build mode
-  if (stripos($variable, $node->type) === false) {
+  if (stripos($variable, $mode) === false) {
     return $title;
   }
 
   // We found this build mode, dig it out
-  $variable = explode("\n", $variable);
+  $variable = explode("\n", str_replace(array('[',']'), '', $variable));
   foreach ($variable as $settings) {
     $settings = explode('|', $settings);
     if (in_array($mode, $settings)) {