diff --git a/include/sqlpp11/boolean.h b/include/sqlpp11/boolean.h
index ed8fe94c..e0a31821 100644
--- a/include/sqlpp11/boolean.h
+++ b/include/sqlpp11/boolean.h
@@ -118,12 +118,12 @@ namespace sqlpp
 						_value = _is_null ? false : (data[0] == 't' or data[0] == '1');
 					}
 
-					void validate()
+					void _validate()
 					{
 						_is_valid = true;
 					}
 
-					void invalidate()
+					void _invalidate()
 					{
 						_is_valid = false;
 						_is_null = true;
diff --git a/include/sqlpp11/floating_point.h b/include/sqlpp11/floating_point.h
index 0b9b57b6..ccf7a43b 100644
--- a/include/sqlpp11/floating_point.h
+++ b/include/sqlpp11/floating_point.h
@@ -119,12 +119,12 @@ namespace sqlpp
 						_value = _is_null ? 0 : std::strtoll(data, nullptr, 10);
 					}
 
-					void validate()
+					void _validate()
 					{
 						_is_valid = true;
 					}
 
-					void invalidate()
+					void _invalidate()
 					{
 						_is_valid = false;
 						_is_null = true;
diff --git a/include/sqlpp11/integral.h b/include/sqlpp11/integral.h
index 791df00c..61a0bf3c 100644
--- a/include/sqlpp11/integral.h
+++ b/include/sqlpp11/integral.h
@@ -121,14 +121,14 @@ namespace sqlpp
 						_value = _is_null ? 0 : std::strtoll(data, nullptr, 10);
 					}
 
-					void invalidate()
+					void _invalidate()
 					{
 						_is_valid = false;
 						_is_null = true;
 						_value = 0;
 					}
 
-					void validate()
+					void _validate()
 					{
 						_is_valid = true;
 					}
diff --git a/include/sqlpp11/result_row.h b/include/sqlpp11/result_row.h
index 18f4ada2..1094692d 100644
--- a/include/sqlpp11/result_row.h
+++ b/include/sqlpp11/result_row.h
@@ -47,14 +47,14 @@ namespace sqlpp
 
 			result_field() = default;
 
-			void validate()
+			void _validate()
 			{
-				_field::operator()().validate();
+				_field::operator()()._validate();
 			}
 
-			void invalidate()
+			void _invalidate()
 			{
-				_field::operator()().invalidate();
+				_field::operator()()._invalidate();
 			}
 
 			template<typename Target>
@@ -72,14 +72,14 @@ namespace sqlpp
 
 				result_field() = default;
 
-				void validate()
+				void _validate()
 				{
-					_multi_field::operator()().validate();
+					_multi_field::operator()()._validate();
 				}
 
-				void invalidate()
+				void _invalidate()
 				{
-					_multi_field::operator()().invalidate();
+					_multi_field::operator()()._invalidate();
 				}
 
 				template<typename Target>
@@ -97,16 +97,16 @@ namespace sqlpp
 
 				result_row_impl() = default;
 
-				void validate()
+				void _validate()
 				{
 					using swallow = int[];
-					(void) swallow{(result_field<Db, Is, NamedExprs>::validate(), 0)...};
+					(void) swallow{(result_field<Db, Is, NamedExprs>::_validate(), 0)...};
 				}
 
-				void invalidate()
+				void _invalidate()
 				{
 					using swallow = int[];
-					(void) swallow{(result_field<Db, Is, NamedExprs>::invalidate(), 0)...};
+					(void) swallow{(result_field<Db, Is, NamedExprs>::_invalidate(), 0)...};
 				}
 
 				template<typename Target>
@@ -144,15 +144,15 @@ namespace sqlpp
 		result_row_t& operator=(const result_row_t&) = delete;
 		result_row_t& operator=(result_row_t&&) = default;
 
-		void validate()
+		void _validate()
 		{
-			_impl::validate();
+			_impl::_validate();
 			_is_valid = true;
 		}
 
-		void invalidate()
+		void _invalidate()
 		{
-			_impl::invalidate();
+			_impl::_invalidate();
 			_is_valid = false;
 		}
 
@@ -211,24 +211,24 @@ namespace sqlpp
 		dynamic_result_row_t& operator=(const dynamic_result_row_t&) = delete;
 		dynamic_result_row_t& operator=(dynamic_result_row_t&&) = default;
 
-		void validate()
+		void _validate()
 		{
 
-			_impl::validate();
+			_impl::_validate();
 			_is_valid = true;
 			for (auto& field : _dynamic_fields)
 			{
-				field.second.validate();
+				field.second._validate();
 			}
 		}
 
-		void invalidate()
+		void _invalidate()
 		{
-			_impl::invalidate();
+			_impl::_invalidate();
 			_is_valid = false;
 			for (auto& field : _dynamic_fields)
 			{
-				field.second.invalidate();
+				field.second._invalidate();
 			}
 		}
 
diff --git a/include/sqlpp11/text.h b/include/sqlpp11/text.h
index 0e0c6a53..1f50667a 100644
--- a/include/sqlpp11/text.h
+++ b/include/sqlpp11/text.h
@@ -117,12 +117,12 @@ namespace sqlpp
 						_len = _value_ptr ? len: 0;
 					}
 
-					void validate()
+					void _validate()
 					{
 						_is_valid = true;
 					}
 
-					void invalidate()
+					void _invalidate()
 					{
 						_is_valid = false;
 						_value_ptr = nullptr;
diff --git a/tests/MockDb.h b/tests/MockDb.h
index a80067de..9c4dafd9 100644
--- a/tests/MockDb.h
+++ b/tests/MockDb.h
@@ -85,7 +85,7 @@ struct MockDb: public sqlpp::connection
 		template<typename ResultRow>
 			void next(ResultRow& result_row)
 			{
-				result_row.invalidate();
+				result_row._invalidate();
 			};
 	};