diff --git a/proxy.h b/proxy.h
index c5921b86..de470900 100644
--- a/proxy.h
+++ b/proxy.h
@@ -1438,7 +1438,7 @@ using op_dispatch_accessor = typename op_dispatch_traits<SIGN, POS>
     ___PRO_EXPAND_MACRO( \
         ___PRO_DEF_OPERATOR_DISPATCH, __NAME, right, __VA_ARGS__)
 
-#define ___PRO_DEF_CONVERTION_DISPATCH_IMPL(__NAME, __T, ...) \
+#define ___PRO_DEF_CONVERSION_DISPATCH_IMPL(__NAME, __T, ...) \
     struct __NAME { \
       __T operator()(auto& __self) \
           ___PRO_DIRECT_FUNC_IMPL(static_cast<__T>(__self)) \
@@ -1452,13 +1452,13 @@ using op_dispatch_accessor = typename op_dispatch_traits<SIGN, POS>
       }; \
       __VA_ARGS__ \
     }
-#define ___PRO_DEF_CONVERTION_DISPATCH_2(__NAME, __T) \
-    ___PRO_DEF_CONVERTION_DISPATCH_IMPL(__NAME, __T)
-#define ___PRO_DEF_CONVERTION_DISPATCH_3(__NAME, __T, __DEFFUNC) \
-    ___PRO_DEF_CONVERTION_DISPATCH_IMPL( \
+#define ___PRO_DEF_CONVERSION_DISPATCH_2(__NAME, __T) \
+    ___PRO_DEF_CONVERSION_DISPATCH_IMPL(__NAME, __T)
+#define ___PRO_DEF_CONVERSION_DISPATCH_3(__NAME, __T, __DEFFUNC) \
+    ___PRO_DEF_CONVERSION_DISPATCH_IMPL( \
         __NAME, __T, ___PRO_DEFAULT_DISPATCH_CALL_IMPL(__DEFFUNC))
-#define PRO_DEF_CONVERTION_DISPATCH(__NAME, ...) \
-    ___PRO_EXPAND_MACRO(___PRO_DEF_CONVERTION_DISPATCH, __NAME, __VA_ARGS__)
+#define PRO_DEF_CONVERSION_DISPATCH(__NAME, ...) \
+    ___PRO_EXPAND_MACRO(___PRO_DEF_CONVERSION_DISPATCH, __NAME, __VA_ARGS__)
 
 }  // namespace pro
 
diff --git a/tests/proxy_dispatch_tests.cpp b/tests/proxy_dispatch_tests.cpp
index 5dc09717..89a09568 100644
--- a/tests/proxy_dispatch_tests.cpp
+++ b/tests/proxy_dispatch_tests.cpp
@@ -76,7 +76,7 @@ PRO_DEF_PREFIX_OPERATOR_DISPATCH(PreOpRightShift, ">>");
 PRO_DEF_PREFIX_OPERATOR_DISPATCH(PreOpComma, ",");
 PRO_DEF_PREFIX_OPERATOR_DISPATCH(PreOpPtrToMem, "->*");
 
-PRO_DEF_CONVERTION_DISPATCH(ConvertToInt, int);
+PRO_DEF_CONVERSION_DISPATCH(ConvertToInt, int);
 
 struct CommaTester {
 public:
@@ -579,7 +579,7 @@ TEST(ProxyDispatchTests, TestPreOpPtrToMem) {
   ASSERT_EQ(2->*p, 6);
 }
 
-TEST(ProxyDispatchTests, TestConvertion) {
+TEST(ProxyDispatchTests, TestConversion) {
   struct TestFacade : pro::facade_builder::add_convention<ConvertToInt, int()>::build {};
   double v = 12.3;
   pro::proxy<TestFacade> p = &v;