diff --git a/CMake/vtkTestingObjectFactory.cmake b/CMake/vtkTestingObjectFactory.cmake
index 004082940892aec0e7a95d65f4765b3478b89d19..1d0bfdf18a2cd54cf435a099e1f898a442c0f19b 100644
--- a/CMake/vtkTestingObjectFactory.cmake
+++ b/CMake/vtkTestingObjectFactory.cmake
@@ -3,7 +3,7 @@ SET(CMAKE_TESTDRIVER_BEFORE_TESTMAIN
     // Set defaults
     vtkTestingInteractor::ValidBaseline =
       std::string(\"${VTK_DATA_ROOT}\") +
-      std::string(\"/Baseline/\") +
+      std::string(\"/Baseline/Cxx/\") +
       std::string(\"${KIT}/\") +
       std::string(cmakeGeneratedFunctionMapEntries[testToRun].name) +
       std::string(\".png\");
diff --git a/src/Admin/ScrapeRepo b/src/Admin/ScrapeRepo
index 4d1b97b12bde38eed6c44816017590bac3dde0e4..b80952ee5bec586b0bf87fd697c91c7379007845 100755
--- a/src/Admin/ScrapeRepo
+++ b/src/Admin/ScrapeRepo
@@ -142,7 +142,7 @@ for lang, langExt in Languages.items():
             if ExampleExt != langExt:
                 continue
             print "ExampleName: " + ExampleName + ExampleExt
-            BaselinePath = RepoDir + "/Testing/Baseline/" + KitName + "/Test" + ExampleName + ".png"
+            BaselinePath = RepoDir + "/Testing/Baseline/" + lang + "/" + KitName + "/Test" + ExampleName + ".png"
             PathName = DocDir + "/" + lang + "/" + KitName
             if not os.path.exists(PathName):
                 if PathName != "":
@@ -153,7 +153,7 @@ for lang, langExt in Languages.items():
                     
             if os.path.isfile(BaselinePath) :
                 print "BaselinePath: " + BaselinePath
-                ImgUrl =  RepoURL + "/blob/master/src/Testing/Baseline/" + KitName + "/Test" + ExampleName + ".png?raw=true"
+                ImgUrl =  RepoURL + "/blob/master/src/Testing/Baseline/" + lang + "/" + KitName + "/Test" + ExampleName + ".png?raw=true"
                 print "ImgUrl: " + ImgUrl
                 MdFile.write('<img style="float:middle" src="' + ImgUrl + '" width="256" />' + '\n')
                 MdFile.write("\n")
diff --git a/src/Instructions/ForDevelopers.md b/src/Instructions/ForDevelopers.md
index 1296501946758854d4bc4bbcaacc379b4ab52912..9959491cba36d5d9e579636038f2071da9cea6b1 100644
--- a/src/Instructions/ForDevelopers.md
+++ b/src/Instructions/ForDevelopers.md
@@ -130,7 +130,7 @@ DataStructures, Filters, GeometricObjects, Images, Meshes, etc.
 
 4. If your example does any rendering, the test will fail the first time and create an image in VTKExamples/build/Testing/Temporary. The image will be called Test**MyNewExample**.png.
 
-5. Copy the image into: VTKExamples/src/Testing/Baseline/**TOPIC**/
+5. Copy the image into: VTKExamples/src/Testing/Baseline/**LANG**/**TOPIC**/
 
 6. Rerun ctest and the test should pass.
 
@@ -153,7 +153,7 @@ git add MyNewExample.cxx
 and if you have a baseline image,
 
 ```
-git add Testing/Baseline/TOPIC/TestMyNewExample.png
+git add Testing/Baseline/LANG/TOPIC/TestMyNewExample.png
 ```
 ```
 git commit