diff --git a/src/com/facebook/buck/apple/AppleConfig.java b/src/com/facebook/buck/apple/AppleConfig.java
index a6660c85499..5a1c45c954a 100644
--- a/src/com/facebook/buck/apple/AppleConfig.java
+++ b/src/com/facebook/buck/apple/AppleConfig.java
@@ -323,6 +323,10 @@ public boolean shouldGenerateMissingUmbrellaHeaders() {
     return delegate.getBooleanValue(APPLE_SECTION, "generate_missing_umbrella_headers", false);
   }
 
+  public boolean shouldUseShortNamesForTargetsInXcodeProject() {
+    return delegate.getBooleanValue(APPLE_SECTION, "use_short_names_for_targets_in_xcode", true);
+  }
+
   public boolean shouldUseSwiftDelegate() {
     // TODO(mgd): Remove Swift delegation from Apple rules
     return delegate.getBooleanValue(APPLE_SECTION, "use_swift_delegate", true);
diff --git a/src/com/facebook/buck/features/apple/project/XCodeProjectCommandHelper.java b/src/com/facebook/buck/features/apple/project/XCodeProjectCommandHelper.java
index 0481e296de9..0e215e96af0 100644
--- a/src/com/facebook/buck/features/apple/project/XCodeProjectCommandHelper.java
+++ b/src/com/facebook/buck/features/apple/project/XCodeProjectCommandHelper.java
@@ -379,6 +379,7 @@ private ExitCode runXcodeProjectGenerator(
             .setShouldUseShortNamesForTargets(true)
             .setShouldCreateDirectoryStructure(combinedProject)
             .setShouldGenerateProjectSchemes(createProjectSchemes)
+            .setShouldUseShortNamesForTargets(appleConfig.shouldUseShortNamesForTargetsInXcodeProject())
             .build();
 
     LOG.debug("Xcode project generation: Generates workspaces for targets");