diff --git a/demos/xcode/include/MyLib/TestClass.h b/demos/xcode6/include/MyLib/TestClass.h
similarity index 100%
rename from demos/xcode/include/MyLib/TestClass.h
rename to demos/xcode6/include/MyLib/TestClass.h
diff --git a/demos/xcode/src/MyLib/TestClass.cpp b/demos/xcode6/src/MyLib/TestClass.cpp
similarity index 100%
rename from demos/xcode/src/MyLib/TestClass.cpp
rename to demos/xcode6/src/MyLib/TestClass.cpp
diff --git a/demos/xcode/src/test.cpp b/demos/xcode6/src/test.cpp
similarity index 100%
rename from demos/xcode/src/test.cpp
rename to demos/xcode6/src/test.cpp
diff --git a/demos/xcode/wscript b/demos/xcode6/wscript
similarity index 92%
rename from demos/xcode/wscript
rename to demos/xcode6/wscript
index 007db4e9..e96e82e8 100644
--- a/demos/xcode/wscript
+++ b/demos/xcode6/wscript
@@ -5,7 +5,7 @@ APPNAME = 'TestProject'
 VERSION = '1.0'
 
 def options(opt):
-	opt.load('xcode')
+	opt.load('xcode6')
 
 def configure(conf):
 	
@@ -14,7 +14,7 @@ def configure(conf):
 	conf.env.MACOSX_DEPLOYMENT_TARGET = '10.9'
 	conf.env.SDKROOT = 'macosx10.9'
 
-	conf.load('xcode')
+	conf.load('xcode6')
 
 def build(bld):
 	
@@ -33,7 +33,7 @@ def build(bld):
 		source=bld.path.ant_glob('src/*.cpp|'),
 		includes=tg.includes,
 		target='MyApp',
-		use='MyLib Yolo',
+		use='MyLib',
 		uselib='SDL2',
 		cxxflags='-O3',
 		framework='Cocoa',
@@ -43,7 +43,7 @@ def build(bld):
 	bld.dylib(
 		source=tg.source,
 		includes=tg.includes,
-		target='MyDynLibYo',
+		target='MyDynLib',
 	)
 
 	bld.exe(
diff --git a/waflib/extras/xcode6.py b/waflib/extras/xcode6.py
index b09d16db..30ffc422 100644
--- a/waflib/extras/xcode6.py
+++ b/waflib/extras/xcode6.py
@@ -410,7 +410,7 @@ class PBXProject(XCodeNode):
 		return None
 
 class xcode(Build.BuildContext):
-	cmd = 'xcode'
+	cmd = 'xcode6'
 	fun = 'build'
 
 	file_refs = dict()