diff --git a/README.md b/README.md
index 3c068fce..79863765 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ Response body on compilation failure:
 }
 ```
 
-Response body on other errors (eg, the name of the module in request body was not Main, or the request body was too large)
+Response body on other errors (eg, the request body was too large)
 
 ```javascript
 {
diff --git a/server/Main.hs b/server/Main.hs
index 3f6cf79e..a576b62a 100644
--- a/server/Main.hs
+++ b/server/Main.hs
@@ -71,10 +71,14 @@ server externs initNamesEnv initEnv port = do
           case CST.parseModuleFromFile "<file>" input >>= CST.resFull of
             Left parseError ->
               return . Left . CompilerErrors . P.toJSONErrors False P.Error $ CST.toMultipleErrors "<file>" parseError
-            Right m | P.getModuleName m == P.ModuleName "Main" -> do
+            Right m -> do
+              -- Rewrite the module name to "$Main" in order to ensure that the
+              -- module name doesn't clash with any existing module names in
+              -- the package set.
+              let rewriteModuleName (P.Module ss coms _ decls refs) = P.Module ss coms (P.moduleNameFromString "$Main") decls refs
               (resultMay, ws) <- runLogger' . runExceptT . flip runReaderT P.defaultOptions $ do
                 ((P.Module ss coms moduleName elaborated exps, env), nextVar) <- P.runSupplyT 0 $ do
-                  desugared <- P.desugar initNamesEnv externs [P.importPrim m] >>= \case
+                  desugared <- P.desugar initNamesEnv externs [P.importPrim (rewriteModuleName m)] >>= \case
                     [d] -> pure d
                     _ -> error "desugaring did not produce one module"
                   P.runCheck' (P.emptyCheckState initEnv) $ P.typeCheckModule desugared
@@ -87,8 +91,6 @@ server externs initNamesEnv initEnv port = do
               case resultMay of
                 Left errs -> (return . Left . CompilerErrors . P.toJSONErrors False P.Error) errs
                 Right js -> (return . Right) (P.toJSONErrors False P.Error ws, js)
-            Right _ ->
-              (return . Left . OtherError) "The name of the main module should be Main."
 
   scottyOpts (getOpts port) $ do
     get "/" $