diff --git a/src/Tulsi/TulsiGeneratorConfigDocument.swift b/src/Tulsi/TulsiGeneratorConfigDocument.swift
index ad39df5..1c74293 100644
--- a/src/Tulsi/TulsiGeneratorConfigDocument.swift
+++ b/src/Tulsi/TulsiGeneratorConfigDocument.swift
@@ -18,7 +18,7 @@
 
 protocol TulsiGeneratorConfigDocumentDelegate: class {
   /// Called when the TulsiGeneratorConfigDocument is saved successfully with a new name.
-  func didNameTulsiGeneratorConfigDocument(_ document: TulsiGeneratorConfigDocument)
+  func didNameTulsiGeneratorConfigDocument(_ document: TulsiGeneratorConfigDocument, configName: String)
 
   /// Used to retrieve project-level option values.
   func parentOptionSetForConfigDocument(_ document: TulsiGeneratorConfigDocument) -> TulsiOptionSet?
@@ -361,7 +361,8 @@
     }
 
     if writeError == nil {
-      self.delegate?.didNameTulsiGeneratorConfigDocument(self)
+      let configName = (url.lastPathComponent as NSString).deletingPathExtension
+      self.delegate?.didNameTulsiGeneratorConfigDocument(self, configName: configName)
     }
   }
 
diff --git a/src/Tulsi/TulsiProjectDocument.swift b/src/Tulsi/TulsiProjectDocument.swift
index 717cedd..b6f7adb 100644
--- a/src/Tulsi/TulsiProjectDocument.swift
+++ b/src/Tulsi/TulsiProjectDocument.swift
@@ -442,8 +442,7 @@
 
   // MARK: - TulsiGeneratorConfigDocumentDelegate
 
-  func didNameTulsiGeneratorConfigDocument(_ document: TulsiGeneratorConfigDocument) {
-    guard let configName = document.configName else { return }
+  func didNameTulsiGeneratorConfigDocument(_ document: TulsiGeneratorConfigDocument, configName: String) {
     if !generatorConfigNames.contains(configName) {
       let configNames = (generatorConfigNames + [configName]).sorted()
       generatorConfigNames = configNames