diff --git a/src/modals/SelectMapModal.js b/src/modals/SelectMapModal.js
index de5069d..c47c27e 100644
--- a/src/modals/SelectMapModal.js
+++ b/src/modals/SelectMapModal.js
@@ -1,6 +1,7 @@
 import React, { useRef, useState, useContext } from "react";
 import { Button, Flex, Label } from "theme-ui";
 import shortid from "shortid";
+import Case from "case";
 
 import EditMapModal from "./EditMapModal";
 import EditGroupModal from "./EditGroupModal";
@@ -139,6 +140,8 @@ function SelectMapModal({
           // Clean string
           name = name.replace(/ +/g, " ");
           name = name.trim();
+          // Capitalize and remove underscores
+          name = Case.capital(name);
         }
 
         // Create resolutions
diff --git a/src/modals/SelectTokensModal.js b/src/modals/SelectTokensModal.js
index 82080a9..fcafd48 100644
--- a/src/modals/SelectTokensModal.js
+++ b/src/modals/SelectTokensModal.js
@@ -1,6 +1,7 @@
 import React, { useRef, useContext, useState } from "react";
 import { Flex, Label, Button } from "theme-ui";
 import shortid from "shortid";
+import Case from "case";
 
 import EditTokenModal from "./EditTokenModal";
 import EditGroupModal from "./EditGroupModal";
@@ -80,6 +81,8 @@ function SelectTokensModal({ isOpen, onRequestClose }) {
       // Clean string
       name = name.replace(/ +/g, " ");
       name = name.trim();
+      // Capitalize and remove underscores
+      name = Case.capital(name);
     }
     let image = new Image();
     setImageLoading(true);