diff --git a/src/debug_begin.h b/src/debug_begin.h
index 9a904095..521e99cf 100644
--- a/src/debug_begin.h
+++ b/src/debug_begin.h
@@ -1,42 +1,42 @@
 #if defined(__GNUC__) && !defined(__LCC__)
 
-#pragma push_macro("mdbx_trace")
-#pragma push_macro("mdbx_debug")
-#pragma push_macro("mdbx_verbose")
-#pragma push_macro("mdbx_notice")
-#pragma push_macro("mdbx_warning")
-#pragma push_macro("mdbx_error")
-#pragma push_macro("mdbx_assert")
+#pragma push_macro("TRACE")
+#pragma push_macro("DEBUG")
+#pragma push_macro("VERBOSE")
+#pragma push_macro("NOTICE")
+#pragma push_macro("WARNING")
+#pragma push_macro("ERROR")
+#pragma push_macro("eASSERT")
 
-#undef mdbx_trace
-#define mdbx_trace(fmt, ...)                                                   \
-  mdbx_debug_log(MDBX_LOG_TRACE, __func__, __LINE__, fmt "\n", __VA_ARGS__)
+#undef TRACE
+#define TRACE(fmt, ...)                                                        \
+  debug_log(MDBX_LOG_TRACE, __func__, __LINE__, fmt "\n", __VA_ARGS__)
 
-#undef mdbx_debug
-#define mdbx_debug(fmt, ...)                                                   \
-  mdbx_debug_log(MDBX_LOG_DEBUG, __func__, __LINE__, fmt "\n", __VA_ARGS__)
+#undef DEBUG
+#define DEBUG(fmt, ...)                                                        \
+  debug_log(MDBX_LOG_DEBUG, __func__, __LINE__, fmt "\n", __VA_ARGS__)
 
-#undef mdbx_verbose
-#define mdbx_verbose(fmt, ...)                                                 \
-  mdbx_debug_log(MDBX_LOG_VERBOSE, __func__, __LINE__, fmt "\n", __VA_ARGS__)
+#undef VERBOSE
+#define VERBOSE(fmt, ...)                                                      \
+  debug_log(MDBX_LOG_VERBOSE, __func__, __LINE__, fmt "\n", __VA_ARGS__)
 
-#undef mdbx_notice
-#define mdbx_notice(fmt, ...)                                                  \
-  mdbx_debug_log(MDBX_LOG_NOTICE, __func__, __LINE__, fmt "\n", __VA_ARGS__)
+#undef NOTICE
+#define NOTICE(fmt, ...)                                                       \
+  debug_log(MDBX_LOG_NOTICE, __func__, __LINE__, fmt "\n", __VA_ARGS__)
 
-#undef mdbx_warning
-#define mdbx_warning(fmt, ...)                                                 \
-  mdbx_debug_log(MDBX_LOG_WARN, __func__, __LINE__, fmt "\n", __VA_ARGS__)
+#undef WARNING
+#define WARNING(fmt, ...)                                                      \
+  debug_log(MDBX_LOG_WARN, __func__, __LINE__, fmt "\n", __VA_ARGS__)
 
-#undef mdbx_error
-#define mdbx_error(fmt, ...)                                                   \
-  mdbx_debug_log(MDBX_LOG_ERROR, __func__, __LINE__, fmt "\n", __VA_ARGS__)
+#undef ERROR
+#define ERROR(fmt, ...)                                                        \
+  debug_log(MDBX_LOG_ERROR, __func__, __LINE__, fmt "\n", __VA_ARGS__)
 
-#undef mdbx_assert
-#define mdbx_assert(env, expr) mdbx_ensure(env, expr)
+#undef eASSERT
+#define eASSERT(env, expr) ENSURE(env, expr)
 
 #if !defined(__clang__)
-#pragma GCC optimize("-O0")
+#pragma GCC optimize("-Og")
 #endif
 
 #endif /* GCC only */
diff --git a/src/debug_end.h b/src/debug_end.h
index a854f715..bbf66526 100644
--- a/src/debug_end.h
+++ b/src/debug_end.h
@@ -1,12 +1,12 @@
 #if defined(__GNUC__) && !defined(__LCC__)
 
-#pragma pop_macro("mdbx_trace")
-#pragma pop_macro("mdbx_debug")
-#pragma pop_macro("mdbx_verbose")
-#pragma pop_macro("mdbx_notice")
-#pragma pop_macro("mdbx_warning")
-#pragma pop_macro("mdbx_error")
-#pragma pop_macro("mdbx_assert")
+#pragma pop_macro("TRACE")
+#pragma pop_macro("DEBUG")
+#pragma pop_macro("VERBOSE")
+#pragma pop_macro("NOTICE")
+#pragma pop_macro("WARNING")
+#pragma pop_macro("ERROR")
+#pragma pop_macro("eASSERT")
 
 #if !defined(__clang__)
 #pragma GCC reset_options