diff --git a/.env.example b/.env.example
index ee4b20e..96e71bd 100644
--- a/.env.example
+++ b/.env.example
@@ -2,3 +2,5 @@ export SLACK_TEAM=
 export SLACK_COOKIE=
 export SLACK_API_TOKEN=
 export EMOJI_DIR=
+export EMOJI_NAME_PREFIX=
+export EMOJI_NAME_SUFFIX=
diff --git a/upload.py b/upload.py
index cd1a087..259d320 100755
--- a/upload.py
+++ b/upload.py
@@ -43,6 +43,18 @@ def _argparse():
         default=os.getenv('SLACK_COOKIE'),
         help='Defaults to the $SLACK_COOKIE environment variable.'
     )
+    parser.add_argument(
+        '--prefix', '-p',
+        default=os.getenv('EMOJI_NAME_PREFIX', ''),
+        help='Prefix to add to genereted emoji name. '
+        'Defaults to the $EMOJI_NAME_PREFIX environment variable.'
+    )
+    parser.add_argument(
+        '--suffix', '-s',
+        default=os.getenv('EMOJI_NAME_SUFFIX', ''),
+        help='Suffix to add to generated emoji name. '
+        'Defaults to the $EMOJI_NAME_SUFFIX environment variable.'
+    )
     parser.add_argument(
         'slackmoji_files',
         nargs='+',
@@ -66,7 +78,11 @@ def main():
     skipped = 0
     for filename in args.slackmoji_files:
         print("Processing {}.".format(filename))
-        emoji_name = os.path.splitext(os.path.basename(filename))[0]
+        emoji_name = '{}{}{}'.format(
+            args.prefix.strip(),
+            os.path.splitext(os.path.basename(filename))[0],
+            args.suffix.strip()
+        )
         if emoji_name in existing_emojis:
             print("Skipping {}. Emoji already exists".format(emoji_name))
             skipped += 1
@@ -106,5 +122,6 @@ def upload_emoji(session, emoji_name, filename):
         crumb = soup.find("p", attrs={"class": "alert_error"})
         print("Error with uploading %s: %s" % (emoji_name, crumb.text))
 
+
 if __name__ == '__main__':
     main()