diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9cf128b98..3cc434d134 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,7 +227,7 @@ if (NOT CPPAN_BUILD)
     target_link_libraries       (tesseract ${Leptonica_LIBRARIES})
     export(TARGETS tesseract FILE ${CMAKE_BINARY_DIR}/TesseractTargets.cmake)
 else()
-    target_link_libraries       (tesseract pvt.cppan.demo.leptonica)
+    target_link_libraries       (tesseract pvt.cppan.demo.danbloomberg.leptonica)
     add_dependencies            (tesseract cppan)
     file(WRITE ${CMAKE_BINARY_DIR}/TesseractTargets.cmake "include(${CMAKE_BINARY_DIR}/cppan.cmake)\n")
     export(TARGETS tesseract APPEND FILE ${CMAKE_BINARY_DIR}/TesseractTargets.cmake)
diff --git a/cppan.yml b/cppan.yml
index 70fd5e2b4d..6d91250664 100644
--- a/cppan.yml
+++ b/cppan.yml
@@ -1,137 +1,141 @@
 local_settings:
     use_shared_libs: true
 
-type: library
-c++: 11
-
-files:
-  - api/.*\.cpp
-  - arch/.*\.cpp
-  - ccmain/.*\.cpp
-  - ccstruct/.*\.cpp
-  - ccutil/.*\.cpp
-  - classify/.*\.cpp
-  - cutil/.*\.cpp
-  - dict/.*\.cpp
-  - lstm/.*\.cpp
-  - opencl/.*\.cpp
-  - textord/.*\.cpp
-  - viewer/.*\.cpp
-  - wordrec/.*\.cpp
-
-  - api/.*\.h
-  - arch/.*\.h
-  - ccmain/.*\.h
-  - ccstruct/.*\.h
-  - ccutil/.*\.h
-  - classify/.*\.h
-  - cutil/.*\.h
-  - dict/.*\.h
-  - lstm/.*\.h
-  - opencl/.*\.h
-  - textord/.*\.h
-  - viewer/.*\.h
-  - wordrec/.*\.h
-
-  - vs2010/port/.*
-
-exclude_from_build:
-  - api/tesseractmain.cpp
-  - viewer/svpaint.cpp
-
-include_directories:
-  private:
-    - arch
-    - classify
-    - cutil
-    - dict
-    - lstm
-    - opencl
-    - textord
-    - vs2010/port
-    - viewer
-    - wordrec
-  public:
-    - api
-    - ccmain
-    - ccstruct
-    - ccutil
-
-check_function_exists:
-  - getline
-
-check_symbol_exists:
-  snprintf: stdio.h
-
-check_include_exists:
-  - dlfcn.h
-  - inttypes.h
-  - limits.h
-  - malloc.h
-  - memory.h
-  - stdbool.h
-  - stdint.h
-  - stdlib.h
-  - strings.h
-  - string.h
-  - sys/ipc.h
-  - sys/shm.h
-  - sys/stat.h
-  - sys/types.h
-  - sys/wait.h
-  - tiffio.h
-  - unistd.h
-  - cairo/cairo-version.h
-  - CL/cl.h
-  - OpenCL/cl.h
-  - pango-1.0/pango/pango-features.h
-  - unicode/uchar.h
-
-check_type_size:
-  - long long int
-  - off_t
-  - mbstate_t
-  - wchar_t
-  - _Bool
-
-pre_sources: |
-    # dummy config file
-    if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/config_auto.h)
-        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config_auto.h)
-    endif()
-
-post_sources: |
-    if (NOT WIN32)
-        list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/gettimeofday.cpp")
-        list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/gettimeofday.h")
-        list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/mathfix.h")
-        list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/strcasestr.cpp")
-        list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/strcasestr.h")
-        list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/strtok_r.cpp")
-        list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/strtok_r.h")
-        list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/vcsversion.h")
-    endif()
-
-options:
-    any:
-        definitions:
-            public:
-              - HAVE_CONFIG_H
-              - _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1
-              - USE_STD_NAMESPACE=1
-              - WINDLLNAME="tesseract"
-    shared:
-        definitions:
-            private:
-                - TESS_EXPORTS
-            interface:
-                - TESS_IMPORTS
-
-dependencies:
-    private:
-        # tesseract uses leptonica only internally
-        # and does not expose its interface to users
-        pvt.cppan.demo.leptonica: master
-        # only for training tools, move to them later
+    dependencies:
+        pvt.cppan.demo.danbloomberg.leptonica: master
         pvt.cppan.demo.unicode.icu.i18n: "*"
 
+root_project: pvt.cppan.demo.google.tesseract
+
+projects:
+    tesseract:
+        type: library
+        c++: 11
+
+        files:
+          - api/.*\.cpp
+          - arch/.*\.cpp
+          - ccmain/.*\.cpp
+          - ccstruct/.*\.cpp
+          - ccutil/.*\.cpp
+          - classify/.*\.cpp
+          - cutil/.*\.cpp
+          - dict/.*\.cpp
+          - lstm/.*\.cpp
+          - opencl/.*\.cpp
+          - textord/.*\.cpp
+          - viewer/.*\.cpp
+          - wordrec/.*\.cpp
+
+          - api/.*\.h
+          - arch/.*\.h
+          - ccmain/.*\.h
+          - ccstruct/.*\.h
+          - ccutil/.*\.h
+          - classify/.*\.h
+          - cutil/.*\.h
+          - dict/.*\.h
+          - lstm/.*\.h
+          - opencl/.*\.h
+          - textord/.*\.h
+          - viewer/.*\.h
+          - wordrec/.*\.h
+
+          - vs2010/port/.*
+
+        exclude_from_build:
+          - api/tesseractmain.cpp
+          - viewer/svpaint.cpp
+
+        include_directories:
+          private:
+            - arch
+            - classify
+            - cutil
+            - dict
+            - lstm
+            - opencl
+            - textord
+            - vs2010/port
+            - viewer
+            - wordrec
+          public:
+            - api
+            - ccmain
+            - ccstruct
+            - ccutil
+
+        check_function_exists:
+          - getline
+
+        check_symbol_exists:
+          snprintf: stdio.h
+
+        check_include_exists:
+          - dlfcn.h
+          - inttypes.h
+          - limits.h
+          - malloc.h
+          - memory.h
+          - stdbool.h
+          - stdint.h
+          - stdlib.h
+          - strings.h
+          - string.h
+          - sys/ipc.h
+          - sys/shm.h
+          - sys/stat.h
+          - sys/types.h
+          - sys/wait.h
+          - tiffio.h
+          - unistd.h
+          - cairo/cairo-version.h
+          - CL/cl.h
+          - OpenCL/cl.h
+          - pango-1.0/pango/pango-features.h
+          - unicode/uchar.h
+
+        check_type_size:
+          - long long int
+          - off_t
+          - mbstate_t
+          - wchar_t
+          - _Bool
+
+        pre_sources: |
+            # dummy config file
+            if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/config_auto.h)
+                file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config_auto.h)
+            endif()
+
+        post_sources: |
+            if (NOT WIN32)
+                list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/gettimeofday.cpp")
+                list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/gettimeofday.h")
+                list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/mathfix.h")
+                list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/strcasestr.cpp")
+                list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/strcasestr.h")
+                list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/strtok_r.cpp")
+                list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/strtok_r.h")
+                list(REMOVE_ITEM src "${CMAKE_CURRENT_SOURCE_DIR}/vs2010/port/vcsversion.h")
+            endif()
+
+        options:
+            any:
+                definitions:
+                    public:
+                      - HAVE_CONFIG_H
+                      - _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1
+                      - USE_STD_NAMESPACE=1
+                      - WINDLLNAME="tesseract"
+            shared:
+                definitions:
+                    private:
+                        - TESS_EXPORTS
+                    interface:
+                        - TESS_IMPORTS
+
+        dependencies:
+            private:
+                pvt.cppan.demo.danbloomberg.leptonica: master
+