diff --git a/client/src/components/layouts/components/guide/NavPanel.js b/client/src/components/layouts/components/guide/NavPanel.js
index 616deb36dd..6d57df984b 100644
--- a/client/src/components/layouts/components/guide/NavPanel.js
+++ b/client/src/components/layouts/components/guide/NavPanel.js
@@ -23,8 +23,8 @@ function NoArticles() {
         Could you 
         <a
           href={
-            'https://github.com/freeCodeCamp/guides/blob/master/README.md' +
-            '#freecodecamp-guide'
+            'https://github.com/freeCodeCamp/freeCodeCamp/blob/master/docs/' +
+            'how-to-work-on-guide-articles.md#how-to-work-on-guide-articles'
           }
           rel='noopener noreferrer'
           target='_blank'
diff --git a/client/src/templates/Challenges/utils/index.js b/client/src/templates/Challenges/utils/index.js
index 45e0e8002c..8ec84a7ced 100644
--- a/client/src/templates/Challenges/utils/index.js
+++ b/client/src/templates/Challenges/utils/index.js
@@ -1,7 +1,7 @@
-const guideBase = 'https://guide.freecodecamp.org/certifications';
+const guideBase = '/guide/certifications';
 
 export function createGuideUrl(slug = '') {
-  return guideBase + slug;
+  return guideBase + slug.replace(/^\/learn\//, '/');
 }
 
 export function isGoodXHRStatus(status) {
diff --git a/client/utils/index.js b/client/utils/index.js
index d0201df963..feb63d4137 100644
--- a/client/utils/index.js
+++ b/client/utils/index.js
@@ -2,9 +2,7 @@ exports.dasherize = function dasherize(name) {
   return ('' + name)
     .toLowerCase()
     .replace(/\s/g, '-')
-    .replace(/[^a-z0-9\-.]/gi, '')
-    .replace(/\./g, '-')
-    .replace(/:/g, '');
+    .replace(/[^a-z0-9\-.]/gi, '');
 };
 
 exports.nameify = function nameify(str) {
diff --git a/tools/scripts/ci/md-testing-utils.js b/tools/scripts/ci/md-testing-utils.js
index cf67d20102..874ed7b573 100644
--- a/tools/scripts/ci/md-testing-utils.js
+++ b/tools/scripts/ci/md-testing-utils.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const matter = require('gray-matter');
+const { dasherize } = require('../../../client/utils');
 
 const pass = true;
 
@@ -36,22 +37,13 @@ exports.checkGuideFile = function checkGuideFile(file) {
 
 function checkDirName(dirName, fullPath) {
   return new Promise((resolve, reject) => {
-    if (dirName.replace(/(\s|\_)/, '') !== dirName) {
+    if (dasherize(dirName) !== dirName) {
       return reject(
         new Error(`
-    Invalid character found in '${dirName}', please use '-' for spaces
+Invalid or upper case character found in '${dirName}', please use '-' for spaces
+and all folder names must be lower case. Valid characters are [a-z0-9\\-.].
 
-      Found in:
-        ${fullPath}
-    `)
-      );
-    }
-    if (dirName.toLowerCase() !== dirName) {
-      return reject(
-        new Error(`
-Upper case characters found in ${dirName}, all folder names must be lower case
-
-  Found in :
+  Found in:
     ${fullPath}
 `)
       );
@@ -107,7 +99,7 @@ exports.checkFrontmatter = function checkFrontmatter(
       } catch (e) {
         console.log(`
 
-  The below occured in:
+  The below occurred in:
 
   ${fullPath}