diff --git a/atmos.py b/atmos.py
index f6f8cbd..a96b423 100755
--- a/atmos.py
+++ b/atmos.py
@@ -20,8 +20,8 @@ def main(argv):
 def determine_actions(args, params):
     aws_creds_file = "$HOME/.aws/credentials"
     if (is_git_directory()) and not (args.m):
-        if (args.e):
-            aws_creds_file = aws_creds_file + "-atmos"
+        # if (args.e):
+        #     aws_creds_file = aws_creds_file + "-atmos"
         workspaces.workspace_manager()
 
     workspace = workspaces.get_env()
diff --git a/credentials.py b/credentials.py
index 2e3f5da..68ce121 100644
--- a/credentials.py
+++ b/credentials.py
@@ -1,4 +1,4 @@
-import workspaces, sys
+import workspaces, sys, os
 
 def generate(args):
     current_workspace = workspaces.get_env()
@@ -9,9 +9,7 @@ def generate(args):
 
     project_name = ""
     if (args.project):
-        delimeter = "-"
-        if (args.e):
-            delimeter = "_"
+        delimeter = "_"
         project_name = args.project.upper() + delimeter
 
     contents = ""
@@ -23,7 +21,11 @@ def generate(args):
             print(access_key_name)
             print(secret_key_name)
 
-        contents = contents + "[{workspace}]\n".format(workspace=project_name + workspace)
+        if (workspace == 'default'):
+            contents = contents + "[{workspace}]\n".format(workspace=(workspace).lower())
+        else:
+            contents = contents + "[{workspace}]\n".format(workspace=(project_name.replace("_", "-") + workspace).lower())
+
         try:
             contents = contents + "aws_access_key_id=" + os.environ.get(access_key_name) + "\n"
         except: