diff --git a/README.md b/README.md
index 7b22b432..06b6f6be 100644
--- a/README.md
+++ b/README.md
@@ -587,7 +587,7 @@ int main(int argc, const char* argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#if EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF(true);
 #endif
     ...
@@ -608,7 +608,7 @@ The exiv2 command-line program and sample applications call the following at the
 ```cpp
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#if EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF(true);
 #endif
 ```
diff --git a/samples/addmoddel.cpp b/samples/addmoddel.cpp
index 8186e769..44692a77 100644
--- a/samples/addmoddel.cpp
+++ b/samples/addmoddel.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/conntest.cpp b/samples/conntest.cpp
index a0c99f5b..ececcdda 100644
--- a/samples/conntest.cpp
+++ b/samples/conntest.cpp
@@ -132,7 +132,7 @@ int main(int argc,const char** argv)
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/convert-test.cpp b/samples/convert-test.cpp
index 4bde64a1..53a21212 100644
--- a/samples/convert-test.cpp
+++ b/samples/convert-test.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp
index 96195397..dde358a1 100644
--- a/samples/easyaccess-test.cpp
+++ b/samples/easyaccess-test.cpp
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifcomment.cpp b/samples/exifcomment.cpp
index bfaa7838..adefefe0 100644
--- a/samples/exifcomment.cpp
+++ b/samples/exifcomment.cpp
@@ -32,7 +32,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifdata-test.cpp b/samples/exifdata-test.cpp
index c177c363..60aa6097 100644
--- a/samples/exifdata-test.cpp
+++ b/samples/exifdata-test.cpp
@@ -34,7 +34,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifdata.cpp b/samples/exifdata.cpp
index b737da6c..63f6f0e3 100644
--- a/samples/exifdata.cpp
+++ b/samples/exifdata.cpp
@@ -171,7 +171,7 @@ int main(int argc,const char* argv[])
 {
 	Exiv2::XmpParser::initialize();
 	::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp
index d6849507..5dd21685 100644
--- a/samples/exifprint.cpp
+++ b/samples/exifprint.cpp
@@ -46,7 +46,7 @@ int _tmain(int argc, _tchar* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exifvalue.cpp b/samples/exifvalue.cpp
index c43c2e84..522efef2 100644
--- a/samples/exifvalue.cpp
+++ b/samples/exifvalue.cpp
@@ -30,7 +30,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index 3e9752dc..e6b0db1b 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -287,7 +287,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index f5063805..a5508bff 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -783,7 +783,7 @@ int main(int argc,const char* argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/getopt-test.cpp b/samples/getopt-test.cpp
index 01a36185..258343c7 100644
--- a/samples/getopt-test.cpp
+++ b/samples/getopt-test.cpp
@@ -103,7 +103,7 @@ int main(int argc, char** const argv)
 {
 	Exiv2::XmpParser::initialize();
 	::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/httptest.cpp b/samples/httptest.cpp
index 46471e22..bd47a9f6 100644
--- a/samples/httptest.cpp
+++ b/samples/httptest.cpp
@@ -39,7 +39,7 @@ int main(int argc,const char** argv)
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/ini-test.cpp b/samples/ini-test.cpp
index 22def49d..9f737c35 100644
--- a/samples/ini-test.cpp
+++ b/samples/ini-test.cpp
@@ -34,7 +34,7 @@ int main()
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/iotest.cpp b/samples/iotest.cpp
index 04e5460b..7ac45e11 100644
--- a/samples/iotest.cpp
+++ b/samples/iotest.cpp
@@ -41,7 +41,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/iptceasy.cpp b/samples/iptceasy.cpp
index 6636c00a..2217be13 100644
--- a/samples/iptceasy.cpp
+++ b/samples/iptceasy.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/iptcprint.cpp b/samples/iptcprint.cpp
index 9d0b88ab..29af8f4f 100644
--- a/samples/iptcprint.cpp
+++ b/samples/iptcprint.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/iptctest.cpp b/samples/iptctest.cpp
index d9124e26..83c62484 100644
--- a/samples/iptctest.cpp
+++ b/samples/iptctest.cpp
@@ -36,7 +36,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/key-test.cpp b/samples/key-test.cpp
index 491c4628..4eb43459 100644
--- a/samples/key-test.cpp
+++ b/samples/key-test.cpp
@@ -29,7 +29,7 @@ int main()
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/largeiptc-test.cpp b/samples/largeiptc-test.cpp
index 7414c509..a8c34965 100644
--- a/samples/largeiptc-test.cpp
+++ b/samples/largeiptc-test.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
     try {
         Exiv2::XmpParser::initialize();
         ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
         Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/metacopy.cpp b/samples/metacopy.cpp
index bc7a25ab..7794d102 100644
--- a/samples/metacopy.cpp
+++ b/samples/metacopy.cpp
@@ -33,7 +33,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/mmap-test.cpp b/samples/mmap-test.cpp
index f1eb53b0..c2966dbd 100644
--- a/samples/mmap-test.cpp
+++ b/samples/mmap-test.cpp
@@ -30,7 +30,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/mrwthumb.cpp b/samples/mrwthumb.cpp
index 8f8a7632..39dca0e2 100644
--- a/samples/mrwthumb.cpp
+++ b/samples/mrwthumb.cpp
@@ -28,7 +28,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/mt-test.cpp b/samples/mt-test.cpp
index bf4ed5c6..41c34192 100644
--- a/samples/mt-test.cpp
+++ b/samples/mt-test.cpp
@@ -82,7 +82,7 @@ int main(int argc,const char* argv[])
 {
 	Exiv2::XmpParser::initialize();
 	::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/path-test.cpp b/samples/path-test.cpp
index e84f56da..7dd5abd5 100644
--- a/samples/path-test.cpp
+++ b/samples/path-test.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/prevtest.cpp b/samples/prevtest.cpp
index 5e106afd..07ee33c8 100644
--- a/samples/prevtest.cpp
+++ b/samples/prevtest.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/remotetest.cpp b/samples/remotetest.cpp
index 7444d57e..61ce5ba5 100644
--- a/samples/remotetest.cpp
+++ b/samples/remotetest.cpp
@@ -31,7 +31,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/stringto-test.cpp b/samples/stringto-test.cpp
index 13f32361..898a6558 100644
--- a/samples/stringto-test.cpp
+++ b/samples/stringto-test.cpp
@@ -59,7 +59,7 @@ int main()
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/taglist.cpp b/samples/taglist.cpp
index b08cc1f1..683c75c8 100644
--- a/samples/taglist.cpp
+++ b/samples/taglist.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/tiff-test.cpp b/samples/tiff-test.cpp
index 9d147a3e..b5069613 100644
--- a/samples/tiff-test.cpp
+++ b/samples/tiff-test.cpp
@@ -40,7 +40,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/tiffaddpath-test.cpp b/samples/tiffaddpath-test.cpp
index 60559ec0..2622c242 100644
--- a/samples/tiffaddpath-test.cpp
+++ b/samples/tiffaddpath-test.cpp
@@ -82,7 +82,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/toexv.cpp b/samples/toexv.cpp
index 3353bf64..290c46b3 100644
--- a/samples/toexv.cpp
+++ b/samples/toexv.cpp
@@ -41,7 +41,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/werror-test.cpp b/samples/werror-test.cpp
index a299b9e7..a425e2e7 100644
--- a/samples/werror-test.cpp
+++ b/samples/werror-test.cpp
@@ -29,7 +29,7 @@ int main()
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/write-test.cpp b/samples/write-test.cpp
index b4b6a1ab..01cee433 100644
--- a/samples/write-test.cpp
+++ b/samples/write-test.cpp
@@ -44,7 +44,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/write2-test.cpp b/samples/write2-test.cpp
index 854b7a2d..724e473c 100644
--- a/samples/write2-test.cpp
+++ b/samples/write2-test.cpp
@@ -33,7 +33,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpdump.cpp b/samples/xmpdump.cpp
index f8172c57..97803922 100644
--- a/samples/xmpdump.cpp
+++ b/samples/xmpdump.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpparse.cpp b/samples/xmpparse.cpp
index 68719026..13b181b8 100644
--- a/samples/xmpparse.cpp
+++ b/samples/xmpparse.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpparser-test.cpp b/samples/xmpparser-test.cpp
index 2e96d4bb..1028a14e 100644
--- a/samples/xmpparser-test.cpp
+++ b/samples/xmpparser-test.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* const argv[])
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpprint.cpp b/samples/xmpprint.cpp
index 51077d9a..d28a7e46 100644
--- a/samples/xmpprint.cpp
+++ b/samples/xmpprint.cpp
@@ -36,7 +36,7 @@ int main(int argc, char** argv)
 {
   Exiv2::XmpParser::initialize();
   ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif
 
diff --git a/samples/xmpsample.cpp b/samples/xmpsample.cpp
index f10ea3a3..94e6d992 100644
--- a/samples/xmpsample.cpp
+++ b/samples/xmpsample.cpp
@@ -39,7 +39,7 @@ int main()
 try {
     Exiv2::XmpParser::initialize();
     ::atexit(Exiv2::XmpParser::terminate);
-#ifdef EXIV2_ENABLE_BMFF
+#ifdef EXV_ENABLE_BMFF
     Exiv2::enableBMFF();
 #endif