diff --git a/export.py b/export.py
index 8b742b1..e12b84d 100644
--- a/export.py
+++ b/export.py
@@ -140,6 +140,9 @@ class courseView():
 def makeValidFilename(input_str):
     # Remove invalid characters
     valid_chars = "-_.() %s%s" % (string.ascii_letters, string.digits)
+    input_str = input_str.replace("+"," ") # Canvas default for spaces
+    input_str = input_str.replace(":","-")
+    input_str = input_str.replace("/","-")
     input_str = "".join(c for c in input_str if c in valid_chars)
 
     # Remove leading and trailing whitespace
@@ -150,9 +153,12 @@ def makeValidFilename(input_str):
 def makeValidFolderPath(input_str):
     # Remove invalid characters
     valid_chars = "-_.()/ %s%s" % (string.ascii_letters, string.digits)
+    input_str = input_str.replace("+"," ") # Canvas default for spaces
+    input_str = input_str.replace(":","-")
+    input_str = input_str.replace("/","-")
     input_str = "".join(c for c in input_str if c in valid_chars)
 
-    # Remove leading and trailing whitespace
+    # Remove leading and trailing whitespace, separators
     input_str = input_str.lstrip().rstrip().strip("/").strip("\\")
 
     # Replace path separators with OS default