diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt
index 19ff2dc47..a7eb1e2c6 100644
--- a/Data/MySQL/CMakeLists.txt
+++ b/Data/MySQL/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LIBNAME "PocoMySQL")
+set(LIBNAME "PocoDataMySQL")
 set(LIBNAMED "${LIBNAME}d")
 
 set(SRCS "")
diff --git a/Data/ODBC/CMakeLists.txt b/Data/ODBC/CMakeLists.txt
index 766b9b77e..0a1be546d 100644
--- a/Data/ODBC/CMakeLists.txt
+++ b/Data/ODBC/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LIBNAME "PocoODBC")
+set(LIBNAME "PocoDataODBC")
 set(LIBNAMED "${LIBNAME}d")
 
 set(SRCS 
diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt
index a28dd0000..05cc4693b 100644
--- a/Data/SQLite/CMakeLists.txt
+++ b/Data/SQLite/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LIBNAME  "PocoSQLite")
+set(LIBNAME  "PocoDataSQLite")
 set(LIBNAMED "${LIBNAME}d")
 
 include_directories( include src )
@@ -6,7 +6,7 @@ include_directories( include src )
 set(SRCS "")
 aux_source_directory(src SRCS)
 
-add_definitions(-DSQLITE_THREADSAFE=1 -DSQLITE_-DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE -DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED)
+add_definitions(-DSQLITE_THREADSAFE=1 -DSQLITE_DISABLE_LFS -DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE -DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED)
 
 add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME}