diff --git a/Sources/PostgresNIO/Data/PostgresData+Double.swift b/Sources/PostgresNIO/Data/PostgresData+Double.swift
index 7435cdaa..986f8e23 100644
--- a/Sources/PostgresNIO/Data/PostgresData+Double.swift
+++ b/Sources/PostgresNIO/Data/PostgresData+Double.swift
@@ -3,7 +3,7 @@ import NIOCore
 extension PostgresData {
     public init(double: Double) {
         var buffer = ByteBufferAllocator().buffer(capacity: 0)
-        buffer.writeDouble(double)
+        buffer.psqlWriteDouble(double)
         self.init(type: .float8, formatCode: .binary, value: buffer)
     }
     
@@ -16,10 +16,10 @@ extension PostgresData {
         case .binary:
             switch self.type {
             case .float4:
-                return value.readFloat()
+                return value.psqlReadFloat()
                     .flatMap { Double($0) }
             case .float8:
-                return value.readDouble()
+                return value.psqlReadDouble()
             case .numeric:
                 return self.numeric?.double
             default:
diff --git a/Sources/PostgresNIO/Data/PostgresData+Float.swift b/Sources/PostgresNIO/Data/PostgresData+Float.swift
index e9b7b572..9931ae9c 100644
--- a/Sources/PostgresNIO/Data/PostgresData+Float.swift
+++ b/Sources/PostgresNIO/Data/PostgresData+Float.swift
@@ -12,9 +12,9 @@ extension PostgresData {
         case .binary:
             switch self.type {
             case .float4:
-                return value.readFloat()
+                return value.psqlReadFloat()
             case .float8:
-                return value.readDouble()
+                return value.psqlReadDouble()
                     .flatMap { Float($0) }
             default:
                 return nil
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+Authentication.swift b/Sources/PostgresNIO/Message/PostgresMessage+Authentication.swift
index 44523a5c..e849b29d 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+Authentication.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+Authentication.swift
@@ -23,7 +23,7 @@ extension PostgresMessage {
             case 10:
                 var mechanisms: [String] = []
                 while buffer.readableBytes > 0 {
-                    guard let nextString = buffer.readNullTerminatedString() else {
+                    guard let nextString = buffer.psqlReadNullTerminatedString() else {
                         throw PostgresError.protocol("Could not parse SASL mechanisms from authentication message")
                     }
                     if nextString.isEmpty {
@@ -68,7 +68,7 @@ extension PostgresMessage {
             case .saslMechanisms(let mechanisms):
                 buffer.writeInteger(10, as: Int32.self)
                 mechanisms.forEach {
-                    buffer.writeNullTerminatedString($0)
+                    buffer.psqlWriteNullTerminatedString($0)
                 }
             case .saslContinue(let challenge):
                 buffer.writeInteger(11, as: Int32.self)
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+Bind.swift b/Sources/PostgresNIO/Message/PostgresMessage+Bind.swift
index a5687c40..7e85f57c 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+Bind.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+Bind.swift
@@ -39,8 +39,8 @@ extension PostgresMessage {
         
         /// Serializes this message into a byte buffer.
         public func serialize(into buffer: inout ByteBuffer) {
-            buffer.writeNullTerminatedString(self.portalName)
-            buffer.writeNullTerminatedString(self.statementName)
+            buffer.psqlWriteNullTerminatedString(self.portalName)
+            buffer.psqlWriteNullTerminatedString(self.statementName)
             
             buffer.write(array: self.parameterFormatCodes)
             buffer.write(array: self.parameters) {
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+Close.swift b/Sources/PostgresNIO/Message/PostgresMessage+Close.swift
index 9e5dd99e..6d974ec2 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+Close.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+Close.swift
@@ -33,7 +33,7 @@ extension PostgresMessage {
         /// Serializes this message into a byte buffer.
         public func serialize(into buffer: inout ByteBuffer) throws {
             buffer.writeInteger(target.rawValue)
-            buffer.writeNullTerminatedString(name)
+            buffer.psqlWriteNullTerminatedString(name)
         }
     }
 }
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+CommandComplete.swift b/Sources/PostgresNIO/Message/PostgresMessage+CommandComplete.swift
index 406dc036..7e3035ac 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+CommandComplete.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+CommandComplete.swift
@@ -5,7 +5,7 @@ extension PostgresMessage {
     public struct CommandComplete: PostgresMessageType {
         /// Parses an instance of this message type from a byte buffer.
         public static func parse(from buffer: inout ByteBuffer) throws -> CommandComplete {
-            guard let string = buffer.readNullTerminatedString() else {
+            guard let string = buffer.psqlReadNullTerminatedString() else {
                 throw PostgresError.protocol("Could not parse close response message")
             }
             return .init(tag: string)
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+Describe.swift b/Sources/PostgresNIO/Message/PostgresMessage+Describe.swift
index 8c3bc8f5..c41e5b44 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+Describe.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+Describe.swift
@@ -31,7 +31,7 @@ extension PostgresMessage {
         /// Serializes this message into a byte buffer.
         public func serialize(into buffer: inout ByteBuffer) {
             buffer.writeInteger(command.rawValue)
-            buffer.writeNullTerminatedString(name)
+            buffer.psqlWriteNullTerminatedString(name)
         }
     }
 }
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+Error.swift b/Sources/PostgresNIO/Message/PostgresMessage+Error.swift
index 51b9be7e..6aca3387 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+Error.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+Error.swift
@@ -11,7 +11,7 @@ extension PostgresMessage {
         public static func parse(from buffer: inout ByteBuffer) throws -> Error {
             var fields: [Field: String] = [:]
             while let field = buffer.readInteger(as: Field.self) {
-                guard let string = buffer.readNullTerminatedString() else {
+                guard let string = buffer.psqlReadNullTerminatedString() else {
                     throw PostgresError.protocol("Could not read error response string.")
                 }
                 fields[field] = string
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+Execute.swift b/Sources/PostgresNIO/Message/PostgresMessage+Execute.swift
index 4b8bc999..3451ef64 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+Execute.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+Execute.swift
@@ -20,7 +20,7 @@ extension PostgresMessage {
         
         /// Serializes this message into a byte buffer.
         public func serialize(into buffer: inout ByteBuffer) {
-            buffer.writeNullTerminatedString(portalName)
+            buffer.psqlWriteNullTerminatedString(portalName)
             buffer.writeInteger(self.maxRows)
         }
     }
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+NotificationResponse.swift b/Sources/PostgresNIO/Message/PostgresMessage+NotificationResponse.swift
index 4979e354..27d8df80 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+NotificationResponse.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+NotificationResponse.swift
@@ -10,10 +10,10 @@ extension PostgresMessage {
             guard let backendPID: Int32 = buffer.readInteger() else {
                 throw PostgresError.protocol("Invalid NotificationResponse message: unable to read backend PID")
             }
-            guard let channel = buffer.readNullTerminatedString() else {
+            guard let channel = buffer.psqlReadNullTerminatedString() else {
                 throw PostgresError.protocol("Invalid NotificationResponse message: unable to read channel")
             }
-            guard let payload = buffer.readNullTerminatedString() else {
+            guard let payload = buffer.psqlReadNullTerminatedString() else {
                 throw PostgresError.protocol("Invalid NotificationResponse message: unable to read payload")
             }
             return .init(backendPID: backendPID, channel: channel, payload: payload)
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+ParameterStatus.swift b/Sources/PostgresNIO/Message/PostgresMessage+ParameterStatus.swift
index 5e2f5881..59af4c1f 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+ParameterStatus.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+ParameterStatus.swift
@@ -4,10 +4,10 @@ extension PostgresMessage {
     public struct ParameterStatus: PostgresMessageType, CustomStringConvertible {
         /// Parses an instance of this message type from a byte buffer.
         public static func parse(from buffer: inout ByteBuffer) throws -> ParameterStatus {
-            guard let parameter = buffer.readNullTerminatedString() else {
+            guard let parameter = buffer.psqlReadNullTerminatedString() else {
                 throw PostgresError.protocol("Could not read parameter from parameter status message")
             }
-            guard let value = buffer.readNullTerminatedString() else {
+            guard let value = buffer.psqlReadNullTerminatedString() else {
                 throw PostgresError.protocol("Could not read value from parameter status message")
             }
             return .init(parameter: parameter, value: value)
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+RowDescription.swift b/Sources/PostgresNIO/Message/PostgresMessage+RowDescription.swift
index 48a90c18..cddaac1d 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+RowDescription.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+RowDescription.swift
@@ -11,7 +11,7 @@ extension PostgresMessage {
         /// Describes a single field returns in a `RowDescription` message.
         public struct Field: CustomStringConvertible {
             static func parse(from buffer: inout ByteBuffer) throws -> Field {
-                guard let name = buffer.readNullTerminatedString() else {
+                guard let name = buffer.psqlReadNullTerminatedString() else {
                     throw PostgresError.protocol("Could not read row description field name")
                 }
                 guard let tableOID = buffer.readInteger(as: UInt32.self) else {
diff --git a/Sources/PostgresNIO/Message/PostgresMessage+SASLResponse.swift b/Sources/PostgresNIO/Message/PostgresMessage+SASLResponse.swift
index 553edc2c..66b4cb5f 100644
--- a/Sources/PostgresNIO/Message/PostgresMessage+SASLResponse.swift
+++ b/Sources/PostgresNIO/Message/PostgresMessage+SASLResponse.swift
@@ -38,7 +38,7 @@ extension PostgresMessage {
         public let initialData: [UInt8]
         
         public static func parse(from buffer: inout ByteBuffer) throws -> PostgresMessage.SASLInitialResponse {
-            guard let mechanism = buffer.readNullTerminatedString() else {
+            guard let mechanism = buffer.psqlReadNullTerminatedString() else {
                 throw PostgresError.protocol("Could not parse SASL mechanism from initial response message")
             }
             guard let dataLength = buffer.readInteger(as: Int32.self) else {
@@ -57,7 +57,7 @@ extension PostgresMessage {
         }
         
         public func serialize(into buffer: inout ByteBuffer) throws {
-            buffer.writeNullTerminatedString(mechanism)
+            buffer.psqlWriteNullTerminatedString(mechanism)
             if initialData.count > 0 {
                 buffer.writeInteger(Int32(initialData.count), as: Int32.self) // write(array:) writes Int16, which is incorrect here
                 buffer.writeBytes(initialData)
diff --git a/Sources/PostgresNIO/New/Data/Float+PSQLCodable.swift b/Sources/PostgresNIO/New/Data/Float+PSQLCodable.swift
index e86894a2..6a551e64 100644
--- a/Sources/PostgresNIO/New/Data/Float+PSQLCodable.swift
+++ b/Sources/PostgresNIO/New/Data/Float+PSQLCodable.swift
@@ -12,12 +12,12 @@ extension Float: PSQLCodable {
     static func decode(from buffer: inout ByteBuffer, type: PSQLDataType, format: PSQLFormat, context: PSQLDecodingContext) throws -> Float {
         switch (format, type) {
         case (.binary, .float4):
-            guard buffer.readableBytes == 4, let float = buffer.readFloat() else {
+            guard buffer.readableBytes == 4, let float = buffer.psqlReadFloat() else {
                 throw PSQLCastingError.failure(targetType: Self.self, type: type, postgresData: buffer, context: context)
             }
             return float
         case (.binary, .float8):
-            guard buffer.readableBytes == 8, let double = buffer.readDouble() else {
+            guard buffer.readableBytes == 8, let double = buffer.psqlReadDouble() else {
                 throw PSQLCastingError.failure(targetType: Self.self, type: type, postgresData: buffer, context: context)
             }
             return Float(double)
@@ -32,7 +32,7 @@ extension Float: PSQLCodable {
     }
     
     func encode(into byteBuffer: inout ByteBuffer, context: PSQLEncodingContext) {
-        byteBuffer.writeFloat(self)
+        byteBuffer.psqlWriteFloat(self)
     }
 }
 
@@ -48,12 +48,12 @@ extension Double: PSQLCodable {
     static func decode(from buffer: inout ByteBuffer, type: PSQLDataType, format: PSQLFormat, context: PSQLDecodingContext) throws -> Double {
         switch (format, type) {
         case (.binary, .float4):
-            guard buffer.readableBytes == 4, let float = buffer.readFloat() else {
+            guard buffer.readableBytes == 4, let float = buffer.psqlReadFloat() else {
                 throw PSQLCastingError.failure(targetType: Self.self, type: type, postgresData: buffer, context: context)
             }
             return Double(float)
         case (.binary, .float8):
-            guard buffer.readableBytes == 8, let double = buffer.readDouble() else {
+            guard buffer.readableBytes == 8, let double = buffer.psqlReadDouble() else {
                 throw PSQLCastingError.failure(targetType: Self.self, type: type, postgresData: buffer, context: context)
             }
             return double
@@ -68,7 +68,7 @@ extension Double: PSQLCodable {
     }
     
     func encode(into byteBuffer: inout ByteBuffer, context: PSQLEncodingContext) {
-        byteBuffer.writeDouble(self)
+        byteBuffer.psqlWriteDouble(self)
     }
 }
 
diff --git a/Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift b/Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift
index 45197cc0..79d5256e 100644
--- a/Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift
+++ b/Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift
@@ -1,12 +1,12 @@
 import NIOCore
 
 internal extension ByteBuffer {
-    mutating func writeNullTerminatedString(_ string: String) {
+    mutating func psqlWriteNullTerminatedString(_ string: String) {
         self.writeString(string)
         self.writeInteger(0, as: UInt8.self)
     }
     
-    mutating func readNullTerminatedString() -> String? {
+    mutating func psqlReadNullTerminatedString() -> String? {
         guard let nullIndex = readableBytesView.firstIndex(of: 0) else {
             return nil
         }
@@ -15,27 +15,27 @@ internal extension ByteBuffer {
         return readString(length: nullIndex - readerIndex)
     }
     
-    mutating func writeBackendMessageID(_ messageID: PSQLBackendMessage.ID) {
+    mutating func psqlWriteBackendMessageID(_ messageID: PSQLBackendMessage.ID) {
         self.writeInteger(messageID.rawValue)
     }
     
-    mutating func writeFrontendMessageID(_ messageID: PSQLFrontendMessage.ID) {
+    mutating func psqlWriteFrontendMessageID(_ messageID: PSQLFrontendMessage.ID) {
         self.writeInteger(messageID.rawValue)
     }
 
-    mutating func readFloat() -> Float? {
+    mutating func psqlReadFloat() -> Float? {
         return self.readInteger(as: UInt32.self).map { Float(bitPattern: $0) }
     }
 
-    mutating func readDouble() -> Double? {
+    mutating func psqlReadDouble() -> Double? {
         return self.readInteger(as: UInt64.self).map { Double(bitPattern: $0) }
     }
 
-    mutating func writeFloat(_ float: Float) {
+    mutating func psqlWriteFloat(_ float: Float) {
         self.writeInteger(float.bitPattern)
     }
 
-    mutating func writeDouble(_ double: Double) {
+    mutating func psqlWriteDouble(_ double: Double) {
         self.writeInteger(double.bitPattern)
     }
 }
diff --git a/Sources/PostgresNIO/New/Messages/Authentication.swift b/Sources/PostgresNIO/New/Messages/Authentication.swift
index 5ce5b857..92b000a0 100644
--- a/Sources/PostgresNIO/New/Messages/Authentication.swift
+++ b/Sources/PostgresNIO/New/Messages/Authentication.swift
@@ -16,7 +16,7 @@ extension PSQLBackendMessage {
         case saslFinal(data: ByteBuffer)
         
         static func decode(from buffer: inout ByteBuffer) throws -> Self {
-            try buffer.ensureAtLeastNBytesRemaining(2)
+            try buffer.psqlEnsureAtLeastNBytesRemaining(2)
             
             // we have at least two bytes remaining, therefore we can force unwrap this read.
             let authID = buffer.readInteger(as: Int32.self)!
@@ -29,7 +29,7 @@ extension PSQLBackendMessage {
             case 3:
                 return .plaintext
             case 5:
-                try buffer.ensureExactNBytesRemaining(4)
+                try buffer.psqlEnsureExactNBytesRemaining(4)
                 let salt1 = buffer.readInteger(as: UInt8.self)!
                 let salt2 = buffer.readInteger(as: UInt8.self)!
                 let salt3 = buffer.readInteger(as: UInt8.self)!
@@ -47,7 +47,7 @@ extension PSQLBackendMessage {
             case 10:
                 var names = [String]()
                 let endIndex = buffer.readerIndex + buffer.readableBytes
-                while buffer.readerIndex < endIndex, let next = buffer.readNullTerminatedString() {
+                while buffer.readerIndex < endIndex, let next = buffer.psqlReadNullTerminatedString() {
                     names.append(next)
                 }
                 
diff --git a/Sources/PostgresNIO/New/Messages/BackendKeyData.swift b/Sources/PostgresNIO/New/Messages/BackendKeyData.swift
index dfb5738e..fdc41439 100644
--- a/Sources/PostgresNIO/New/Messages/BackendKeyData.swift
+++ b/Sources/PostgresNIO/New/Messages/BackendKeyData.swift
@@ -7,7 +7,7 @@ extension PSQLBackendMessage {
         let secretKey: Int32
         
         static func decode(from buffer: inout ByteBuffer) throws -> Self {
-            try buffer.ensureExactNBytesRemaining(8)
+            try buffer.psqlEnsureExactNBytesRemaining(8)
             
             // We have verified the correct length before, this means we have exactly eight bytes
             // to read. If we have enough readable bytes, a read of Int32 should always succeed.
diff --git a/Sources/PostgresNIO/New/Messages/Bind.swift b/Sources/PostgresNIO/New/Messages/Bind.swift
index 110d7866..dd3465b2 100644
--- a/Sources/PostgresNIO/New/Messages/Bind.swift
+++ b/Sources/PostgresNIO/New/Messages/Bind.swift
@@ -13,8 +13,8 @@ extension PSQLFrontendMessage {
         var parameters: [PSQLEncodable]
         
         func encode(into buffer: inout ByteBuffer, using jsonEncoder: PSQLJSONEncoder) throws {
-            buffer.writeNullTerminatedString(self.portalName)
-            buffer.writeNullTerminatedString(self.preparedStatementName)
+            buffer.psqlWriteNullTerminatedString(self.portalName)
+            buffer.psqlWriteNullTerminatedString(self.preparedStatementName)
             
             // The number of parameter format codes that follow (denoted C below). This can be
             // zero to indicate that there are no parameters or that the parameters all use the
diff --git a/Sources/PostgresNIO/New/Messages/Close.swift b/Sources/PostgresNIO/New/Messages/Close.swift
index 5ed532e6..ae70f758 100644
--- a/Sources/PostgresNIO/New/Messages/Close.swift
+++ b/Sources/PostgresNIO/New/Messages/Close.swift
@@ -10,10 +10,10 @@ extension PSQLFrontendMessage {
             switch self {
             case .preparedStatement(let name):
                 buffer.writeInteger(UInt8(ascii: "S"))
-                buffer.writeNullTerminatedString(name)
+                buffer.psqlWriteNullTerminatedString(name)
             case .portal(let name):
                 buffer.writeInteger(UInt8(ascii: "P"))
-                buffer.writeNullTerminatedString(name)
+                buffer.psqlWriteNullTerminatedString(name)
             }
         }
     }
diff --git a/Sources/PostgresNIO/New/Messages/DataRow.swift b/Sources/PostgresNIO/New/Messages/DataRow.swift
index 54044c6a..1828128b 100644
--- a/Sources/PostgresNIO/New/Messages/DataRow.swift
+++ b/Sources/PostgresNIO/New/Messages/DataRow.swift
@@ -15,12 +15,12 @@ struct DataRow: PSQLBackendMessage.PayloadDecodable, Equatable {
     var bytes: ByteBuffer
     
     static func decode(from buffer: inout ByteBuffer) throws -> Self {
-        try buffer.ensureAtLeastNBytesRemaining(2)
+        try buffer.psqlEnsureAtLeastNBytesRemaining(2)
         let columnCount = buffer.readInteger(as: Int16.self)!
         let firstColumnIndex = buffer.readerIndex
         
         for _ in 0..<columnCount {
-            try buffer.ensureAtLeastNBytesRemaining(2)
+            try buffer.psqlEnsureAtLeastNBytesRemaining(2)
             let bufferLength = Int(buffer.readInteger(as: Int32.self)!)
             
             guard bufferLength >= 0 else {
@@ -28,11 +28,11 @@ struct DataRow: PSQLBackendMessage.PayloadDecodable, Equatable {
                 continue
             }
             
-            try buffer.ensureAtLeastNBytesRemaining(bufferLength)
+            try buffer.psqlEnsureAtLeastNBytesRemaining(bufferLength)
             buffer.moveReaderIndex(forwardBy: bufferLength)
         }
         
-        try buffer.ensureExactNBytesRemaining(0)
+        try buffer.psqlEnsureExactNBytesRemaining(0)
         
         buffer.moveReaderIndex(to: firstColumnIndex)
         let columnSlice = buffer.readSlice(length: buffer.readableBytes)!
diff --git a/Sources/PostgresNIO/New/Messages/Describe.swift b/Sources/PostgresNIO/New/Messages/Describe.swift
index 0a3105cc..104d7127 100644
--- a/Sources/PostgresNIO/New/Messages/Describe.swift
+++ b/Sources/PostgresNIO/New/Messages/Describe.swift
@@ -11,10 +11,10 @@ extension PSQLFrontendMessage {
             switch self {
             case .preparedStatement(let name):
                 buffer.writeInteger(UInt8(ascii: "S"))
-                buffer.writeNullTerminatedString(name)
+                buffer.psqlWriteNullTerminatedString(name)
             case .portal(let name):
                 buffer.writeInteger(UInt8(ascii: "P"))
-                buffer.writeNullTerminatedString(name)
+                buffer.psqlWriteNullTerminatedString(name)
             }
         }
     }
diff --git a/Sources/PostgresNIO/New/Messages/ErrorResponse.swift b/Sources/PostgresNIO/New/Messages/ErrorResponse.swift
index 254cdf0f..891c7e9b 100644
--- a/Sources/PostgresNIO/New/Messages/ErrorResponse.swift
+++ b/Sources/PostgresNIO/New/Messages/ErrorResponse.swift
@@ -117,7 +117,7 @@ extension PSQLBackendMessage.PayloadDecodable where Self: PSQLMessageNotice {
                     asType: PSQLBackendMessage.Field.self)
             }
             
-            guard let string = buffer.readNullTerminatedString() else {
+            guard let string = buffer.psqlReadNullTerminatedString() else {
                 throw PSQLPartialDecodingError.fieldNotDecodable(type: String.self)
             }
             fields[field] = string
diff --git a/Sources/PostgresNIO/New/Messages/Execute.swift b/Sources/PostgresNIO/New/Messages/Execute.swift
index 891bd9aa..2cf13922 100644
--- a/Sources/PostgresNIO/New/Messages/Execute.swift
+++ b/Sources/PostgresNIO/New/Messages/Execute.swift
@@ -15,7 +15,7 @@ extension PSQLFrontendMessage {
         }
         
         func encode(into buffer: inout ByteBuffer) {
-            buffer.writeNullTerminatedString(self.portalName)
+            buffer.psqlWriteNullTerminatedString(self.portalName)
             buffer.writeInteger(self.maxNumberOfRows)
         }
     }
diff --git a/Sources/PostgresNIO/New/Messages/NotificationResponse.swift b/Sources/PostgresNIO/New/Messages/NotificationResponse.swift
index b1430e2a..afc860fc 100644
--- a/Sources/PostgresNIO/New/Messages/NotificationResponse.swift
+++ b/Sources/PostgresNIO/New/Messages/NotificationResponse.swift
@@ -8,13 +8,13 @@ extension PSQLBackendMessage {
         let payload: String
         
         static func decode(from buffer: inout ByteBuffer) throws -> PSQLBackendMessage.NotificationResponse {
-            try buffer.ensureAtLeastNBytesRemaining(6)
+            try buffer.psqlEnsureAtLeastNBytesRemaining(6)
             let backendPID = buffer.readInteger(as: Int32.self)!
             
-            guard let channel = buffer.readNullTerminatedString() else {
+            guard let channel = buffer.psqlReadNullTerminatedString() else {
                 throw PSQLPartialDecodingError.fieldNotDecodable(type: String.self)
             }
-            guard let payload = buffer.readNullTerminatedString() else {
+            guard let payload = buffer.psqlReadNullTerminatedString() else {
                 throw PSQLPartialDecodingError.fieldNotDecodable(type: String.self)
             }
             
diff --git a/Sources/PostgresNIO/New/Messages/ParameterDescription.swift b/Sources/PostgresNIO/New/Messages/ParameterDescription.swift
index fdf64aad..49062fda 100644
--- a/Sources/PostgresNIO/New/Messages/ParameterDescription.swift
+++ b/Sources/PostgresNIO/New/Messages/ParameterDescription.swift
@@ -7,14 +7,14 @@ extension PSQLBackendMessage {
         var dataTypes: [PSQLDataType]
         
         static func decode(from buffer: inout ByteBuffer) throws -> Self {
-            try buffer.ensureAtLeastNBytesRemaining(2)
+            try buffer.psqlEnsureAtLeastNBytesRemaining(2)
             
             let parameterCount = buffer.readInteger(as: Int16.self)!
             guard parameterCount >= 0 else {
                 throw PSQLPartialDecodingError.integerMustBePositiveOrNull(parameterCount)
             }
             
-            try buffer.ensureExactNBytesRemaining(Int(parameterCount) * 4)
+            try buffer.psqlEnsureExactNBytesRemaining(Int(parameterCount) * 4)
             
             var result = [PSQLDataType]()
             result.reserveCapacity(Int(parameterCount))
diff --git a/Sources/PostgresNIO/New/Messages/ParameterStatus.swift b/Sources/PostgresNIO/New/Messages/ParameterStatus.swift
index 89dd1d6d..ebf1e212 100644
--- a/Sources/PostgresNIO/New/Messages/ParameterStatus.swift
+++ b/Sources/PostgresNIO/New/Messages/ParameterStatus.swift
@@ -10,11 +10,11 @@ extension PSQLBackendMessage {
         var value: String
         
         static func decode(from buffer: inout ByteBuffer) throws -> Self {            
-            guard let name = buffer.readNullTerminatedString() else {
+            guard let name = buffer.psqlReadNullTerminatedString() else {
                 throw PSQLPartialDecodingError.fieldNotDecodable(type: String.self)
             }
             
-            guard let value = buffer.readNullTerminatedString() else {
+            guard let value = buffer.psqlReadNullTerminatedString() else {
                 throw PSQLPartialDecodingError.fieldNotDecodable(type: String.self)
             }
             
diff --git a/Sources/PostgresNIO/New/Messages/Parse.swift b/Sources/PostgresNIO/New/Messages/Parse.swift
index 1d0aec19..72eb4962 100644
--- a/Sources/PostgresNIO/New/Messages/Parse.swift
+++ b/Sources/PostgresNIO/New/Messages/Parse.swift
@@ -13,8 +13,8 @@ extension PSQLFrontendMessage {
         let parameters: [PSQLDataType]
         
         func encode(into buffer: inout ByteBuffer) {
-            buffer.writeNullTerminatedString(self.preparedStatementName)
-            buffer.writeNullTerminatedString(self.query)
+            buffer.psqlWriteNullTerminatedString(self.preparedStatementName)
+            buffer.psqlWriteNullTerminatedString(self.query)
             buffer.writeInteger(Int16(self.parameters.count))
             
             self.parameters.forEach { dataType in
diff --git a/Sources/PostgresNIO/New/Messages/Password.swift b/Sources/PostgresNIO/New/Messages/Password.swift
index 88e885f9..df1bd327 100644
--- a/Sources/PostgresNIO/New/Messages/Password.swift
+++ b/Sources/PostgresNIO/New/Messages/Password.swift
@@ -6,7 +6,7 @@ extension PSQLFrontendMessage {
         let value: String
         
         func encode(into buffer: inout ByteBuffer) {
-            buffer.writeNullTerminatedString(value)
+            buffer.psqlWriteNullTerminatedString(value)
         }
     }
     
diff --git a/Sources/PostgresNIO/New/Messages/ReadyForQuery.swift b/Sources/PostgresNIO/New/Messages/ReadyForQuery.swift
index 20420763..74b30200 100644
--- a/Sources/PostgresNIO/New/Messages/ReadyForQuery.swift
+++ b/Sources/PostgresNIO/New/Messages/ReadyForQuery.swift
@@ -33,7 +33,7 @@ extension PSQLBackendMessage {
         }
         
         static func decode(from buffer: inout ByteBuffer) throws -> Self {
-            try buffer.ensureExactNBytesRemaining(1)
+            try buffer.psqlEnsureExactNBytesRemaining(1)
             
             // Exactly one byte is readable. For this reason, we can force unwrap the UInt8 below
             let value = buffer.readInteger(as: UInt8.self)!
diff --git a/Sources/PostgresNIO/New/Messages/RowDescription.swift b/Sources/PostgresNIO/New/Messages/RowDescription.swift
index 49f09baa..ade0e85c 100644
--- a/Sources/PostgresNIO/New/Messages/RowDescription.swift
+++ b/Sources/PostgresNIO/New/Messages/RowDescription.swift
@@ -37,7 +37,7 @@ struct RowDescription: PSQLBackendMessage.PayloadDecodable, Equatable {
     }
     
     static func decode(from buffer: inout ByteBuffer) throws -> Self {
-        try buffer.ensureAtLeastNBytesRemaining(2)
+        try buffer.psqlEnsureAtLeastNBytesRemaining(2)
         let columnCount = buffer.readInteger(as: Int16.self)!
         
         guard columnCount >= 0 else {
@@ -48,11 +48,11 @@ struct RowDescription: PSQLBackendMessage.PayloadDecodable, Equatable {
         result.reserveCapacity(Int(columnCount))
         
         for _ in 0..<columnCount {
-            guard let name = buffer.readNullTerminatedString() else {
+            guard let name = buffer.psqlReadNullTerminatedString() else {
                 throw PSQLPartialDecodingError.fieldNotDecodable(type: String.self)
             }
             
-            try buffer.ensureAtLeastNBytesRemaining(18)
+            try buffer.psqlEnsureAtLeastNBytesRemaining(18)
             
             let tableOID = buffer.readInteger(as: Int32.self)!
             let columnAttributeNumber = buffer.readInteger(as: Int16.self)!
diff --git a/Sources/PostgresNIO/New/Messages/SASLInitialResponse.swift b/Sources/PostgresNIO/New/Messages/SASLInitialResponse.swift
index ead609c7..41dba751 100644
--- a/Sources/PostgresNIO/New/Messages/SASLInitialResponse.swift
+++ b/Sources/PostgresNIO/New/Messages/SASLInitialResponse.swift
@@ -15,7 +15,7 @@ extension PSQLFrontendMessage {
         
         /// Serializes this message into a byte buffer.
         func encode(into buffer: inout ByteBuffer) {
-            buffer.writeNullTerminatedString(self.saslMechanism)
+            buffer.psqlWriteNullTerminatedString(self.saslMechanism)
             
             if self.initialData.count > 0 {
                 buffer.writeInteger(Int32(self.initialData.count))
diff --git a/Sources/PostgresNIO/New/Messages/Startup.swift b/Sources/PostgresNIO/New/Messages/Startup.swift
index 148b8bc2..0ceb1050 100644
--- a/Sources/PostgresNIO/New/Messages/Startup.swift
+++ b/Sources/PostgresNIO/New/Messages/Startup.swift
@@ -51,29 +51,29 @@ extension PSQLFrontendMessage {
         /// Serializes this message into a byte buffer.
         func encode(into buffer: inout ByteBuffer) {
             buffer.writeInteger(self.protocolVersion)
-            buffer.writeNullTerminatedString("user")
+            buffer.psqlWriteNullTerminatedString("user")
             buffer.writeString(self.parameters.user)
             buffer.writeInteger(UInt8(0))
             
             if let database = self.parameters.database {
-                buffer.writeNullTerminatedString("database")
+                buffer.psqlWriteNullTerminatedString("database")
                 buffer.writeString(database)
                 buffer.writeInteger(UInt8(0))
             }
             
             if let options = self.parameters.options {
-                buffer.writeNullTerminatedString("options")
+                buffer.psqlWriteNullTerminatedString("options")
                 buffer.writeString(options)
                 buffer.writeInteger(UInt8(0))
             }
             
             switch self.parameters.replication {
             case .database:
-                buffer.writeNullTerminatedString("replication")
-                buffer.writeNullTerminatedString("replication")
+                buffer.psqlWriteNullTerminatedString("replication")
+                buffer.psqlWriteNullTerminatedString("replication")
             case .true:
-                buffer.writeNullTerminatedString("replication")
-                buffer.writeNullTerminatedString("true")
+                buffer.psqlWriteNullTerminatedString("replication")
+                buffer.psqlWriteNullTerminatedString("true")
             case .false:
                 break
             }
diff --git a/Sources/PostgresNIO/New/PSQLBackendMessage.swift b/Sources/PostgresNIO/New/PSQLBackendMessage.swift
index d65f4623..c71789f1 100644
--- a/Sources/PostgresNIO/New/PSQLBackendMessage.swift
+++ b/Sources/PostgresNIO/New/PSQLBackendMessage.swift
@@ -193,27 +193,27 @@ extension PSQLBackendMessage {
         case .backendKeyData:
             return try .backendKeyData(.decode(from: &buffer))
         case .bindComplete:
-            try buffer.ensureExactNBytesRemaining(0)
+            try buffer.psqlEnsureExactNBytesRemaining(0)
             return .bindComplete
         case .closeComplete:
-            try buffer.ensureExactNBytesRemaining(0)
+            try buffer.psqlEnsureExactNBytesRemaining(0)
             return .closeComplete
         case .commandComplete:
-            guard let commandTag = buffer.readNullTerminatedString() else {
+            guard let commandTag = buffer.psqlReadNullTerminatedString() else {
                 throw PSQLPartialDecodingError.fieldNotDecodable(type: String.self)
             }
             return .commandComplete(commandTag)
         case .dataRow:
             return try .dataRow(.decode(from: &buffer))
         case .emptyQueryResponse:
-            try buffer.ensureExactNBytesRemaining(0)
+            try buffer.psqlEnsureExactNBytesRemaining(0)
             return .emptyQueryResponse
         case .parameterStatus:
             return try .parameterStatus(.decode(from: &buffer))
         case .error:
             return try .error(.decode(from: &buffer))
         case .noData:
-            try buffer.ensureExactNBytesRemaining(0)
+            try buffer.psqlEnsureExactNBytesRemaining(0)
             return .noData
         case .noticeResponse:
             return try .notice(.decode(from: &buffer))
@@ -222,10 +222,10 @@ extension PSQLBackendMessage {
         case .parameterDescription:
             return try .parameterDescription(.decode(from: &buffer))
         case .parseComplete:
-            try buffer.ensureExactNBytesRemaining(0)
+            try buffer.psqlEnsureExactNBytesRemaining(0)
             return .parseComplete
         case .portalSuspended:
-            try buffer.ensureExactNBytesRemaining(0)
+            try buffer.psqlEnsureExactNBytesRemaining(0)
             return .portalSuspended
         case .readyForQuery:
             return try .readyForQuery(.decode(from: &buffer))
diff --git a/Sources/PostgresNIO/New/PSQLBackendMessageDecoder.swift b/Sources/PostgresNIO/New/PSQLBackendMessageDecoder.swift
index edf386df..dd4e4ebf 100644
--- a/Sources/PostgresNIO/New/PSQLBackendMessageDecoder.swift
+++ b/Sources/PostgresNIO/New/PSQLBackendMessageDecoder.swift
@@ -192,13 +192,13 @@ struct PSQLPartialDecodingError: Error {
 }
 
 extension ByteBuffer {
-    func ensureAtLeastNBytesRemaining(_ n: Int, file: String = #file, line: Int = #line) throws {
+    func psqlEnsureAtLeastNBytesRemaining(_ n: Int, file: String = #file, line: Int = #line) throws {
         guard self.readableBytes >= n else {
             throw PSQLPartialDecodingError.expectedAtLeastNRemainingBytes(2, actual: self.readableBytes, file: file, line: line)
         }
     }
 
-    func ensureExactNBytesRemaining(_ n: Int, file: String = #file, line: Int = #line) throws {
+    func psqlEnsureExactNBytesRemaining(_ n: Int, file: String = #file, line: Int = #line) throws {
         guard self.readableBytes == n else {
             throw PSQLPartialDecodingError.expectedExactlyNRemainingBytes(n, actual: self.readableBytes, file: file, line: line)
         }
diff --git a/Sources/PostgresNIO/New/PSQLFrontendMessageEncoder.swift b/Sources/PostgresNIO/New/PSQLFrontendMessageEncoder.swift
index 0a998285..227cd233 100644
--- a/Sources/PostgresNIO/New/PSQLFrontendMessageEncoder.swift
+++ b/Sources/PostgresNIO/New/PSQLFrontendMessageEncoder.swift
@@ -71,7 +71,7 @@ struct PSQLFrontendMessageEncoder: MessageToByteEncoder {
         payload: Payload,
         into buffer: inout ByteBuffer)
     {
-        buffer.writeFrontendMessageID(messageID)
+        buffer.psqlWriteFrontendMessageID(messageID)
         self.encode(payload: payload, into: &buffer)
     }
     
diff --git a/Tests/PostgresNIOTests/New/Extensions/ByteBuffer+Utils.swift b/Tests/PostgresNIOTests/New/Extensions/ByteBuffer+Utils.swift
index 9d1cfb81..835965da 100644
--- a/Tests/PostgresNIOTests/New/Extensions/ByteBuffer+Utils.swift
+++ b/Tests/PostgresNIOTests/New/Extensions/ByteBuffer+Utils.swift
@@ -10,7 +10,7 @@ extension ByteBuffer {
     }
     
     mutating func writeBackendMessage(id: PSQLBackendMessage.ID, _ payload: (inout ByteBuffer) throws -> ()) rethrows {
-        self.writeBackendMessageID(id)
+        self.psqlWriteBackendMessageID(id)
         let lengthIndex = self.writerIndex
         self.writeInteger(Int32(0))
         try payload(&self)
diff --git a/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessageEncoder.swift b/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessageEncoder.swift
index 75cb1afc..6c1be6f5 100644
--- a/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessageEncoder.swift
+++ b/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessageEncoder.swift
@@ -68,7 +68,7 @@ struct PSQLBackendMessageEncoder: MessageToByteEncoder {
         var string: String
         init(_ string: String) { self.string = string }
         func encode(into buffer: inout ByteBuffer) {
-            buffer.writeNullTerminatedString(self.string)
+            buffer.psqlWriteNullTerminatedString(self.string)
         }
     }
 
@@ -77,7 +77,7 @@ struct PSQLBackendMessageEncoder: MessageToByteEncoder {
         payload: Payload,
         into buffer: inout ByteBuffer)
     {
-        buffer.writeBackendMessageID(messageID)
+        buffer.psqlWriteBackendMessageID(messageID)
         let startIndex = buffer.writerIndex
         buffer.writeInteger(Int32(0)) // placeholder for length
         payload.encode(into: &buffer)
@@ -166,7 +166,7 @@ extension PSQLBackendMessage.Authentication: PSQLMessagePayloadEncodable {
         case .sasl(names: let names):
             buffer.writeInteger(Int32(10))
             for name in names {
-                buffer.writeNullTerminatedString(name)
+                buffer.psqlWriteNullTerminatedString(name)
             }
             
         case .saslContinue(data: var data):
@@ -199,7 +199,7 @@ extension PSQLBackendMessage.ErrorResponse: PSQLMessagePayloadEncodable {
     public func encode(into buffer: inout ByteBuffer) {
         for (key, value) in self.fields {
             buffer.writeInteger(key.rawValue, as: UInt8.self)
-            buffer.writeNullTerminatedString(value)
+            buffer.psqlWriteNullTerminatedString(value)
         }
         buffer.writeInteger(0, as: UInt8.self) // signal done
     }
@@ -209,7 +209,7 @@ extension PSQLBackendMessage.NoticeResponse: PSQLMessagePayloadEncodable {
     public func encode(into buffer: inout ByteBuffer) {
         for (key, value) in self.fields {
             buffer.writeInteger(key.rawValue, as: UInt8.self)
-            buffer.writeNullTerminatedString(value)
+            buffer.psqlWriteNullTerminatedString(value)
         }
         buffer.writeInteger(0, as: UInt8.self) // signal done
     }
@@ -218,8 +218,8 @@ extension PSQLBackendMessage.NoticeResponse: PSQLMessagePayloadEncodable {
 extension PSQLBackendMessage.NotificationResponse: PSQLMessagePayloadEncodable {
     public func encode(into buffer: inout ByteBuffer) {
         buffer.writeInteger(self.backendPID)
-        buffer.writeNullTerminatedString(self.channel)
-        buffer.writeNullTerminatedString(self.payload)
+        buffer.psqlWriteNullTerminatedString(self.channel)
+        buffer.psqlWriteNullTerminatedString(self.payload)
     }
 }
 
@@ -235,8 +235,8 @@ extension PSQLBackendMessage.ParameterDescription: PSQLMessagePayloadEncodable {
 
 extension PSQLBackendMessage.ParameterStatus: PSQLMessagePayloadEncodable {
     public func encode(into buffer: inout ByteBuffer) {
-        buffer.writeNullTerminatedString(self.parameter)
-        buffer.writeNullTerminatedString(self.value)
+        buffer.psqlWriteNullTerminatedString(self.parameter)
+        buffer.psqlWriteNullTerminatedString(self.value)
     }
 }
 
@@ -251,7 +251,7 @@ extension RowDescription: PSQLMessagePayloadEncodable {
         buffer.writeInteger(Int16(self.columns.count))
         
         for column in self.columns {
-            buffer.writeNullTerminatedString(column.name)
+            buffer.psqlWriteNullTerminatedString(column.name)
             buffer.writeInteger(column.tableOID)
             buffer.writeInteger(column.columnAttributeNumber)
             buffer.writeInteger(column.dataType.rawValue)
diff --git a/Tests/PostgresNIOTests/New/Extensions/PSQLFrontendMessageDecoder.swift b/Tests/PostgresNIOTests/New/Extensions/PSQLFrontendMessageDecoder.swift
index c639f4b2..4bf988ae 100644
--- a/Tests/PostgresNIOTests/New/Extensions/PSQLFrontendMessageDecoder.swift
+++ b/Tests/PostgresNIOTests/New/Extensions/PSQLFrontendMessageDecoder.swift
@@ -40,8 +40,8 @@ struct PSQLFrontendMessageDecoder: NIOSingleStepByteToMessageDecoder {
                 var database: String?
                 var options: String?
                 
-                while let name = messageSlice.readNullTerminatedString(), messageSlice.readerIndex < finalIndex {
-                    let value = messageSlice.readNullTerminatedString()
+                while let name = messageSlice.psqlReadNullTerminatedString(), messageSlice.readerIndex < finalIndex {
+                    let value = messageSlice.psqlReadNullTerminatedString()
                     
                     switch name {
                     case "user":
@@ -136,7 +136,7 @@ extension PSQLFrontendMessage {
         case .parse:
             preconditionFailure("TODO: Unimplemented")
         case .password:
-            guard let password = buffer.readNullTerminatedString() else {
+            guard let password = buffer.psqlReadNullTerminatedString() else {
                 throw PSQLPartialDecodingError.fieldNotDecodable(type: String.self)
             }
             return .password(.init(value: password))
diff --git a/Tests/PostgresNIOTests/New/Messages/BackendKeyDataTests.swift b/Tests/PostgresNIOTests/New/Messages/BackendKeyDataTests.swift
index eca5ba02..5715c61c 100644
--- a/Tests/PostgresNIOTests/New/Messages/BackendKeyDataTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/BackendKeyDataTests.swift
@@ -21,7 +21,7 @@ class BackendKeyDataTests: XCTestCase {
     
     func testDecodeInvalidLength() {
         var buffer = ByteBuffer()
-        buffer.writeBackendMessageID(.backendKeyData)
+        buffer.psqlWriteBackendMessageID(.backendKeyData)
         buffer.writeInteger(Int32(11))
         buffer.writeInteger(Int32(1234))
         buffer.writeInteger(Int32(4567))
diff --git a/Tests/PostgresNIOTests/New/Messages/BindTests.swift b/Tests/PostgresNIOTests/New/Messages/BindTests.swift
index 7a688d41..234e1541 100644
--- a/Tests/PostgresNIOTests/New/Messages/BindTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/BindTests.swift
@@ -14,8 +14,8 @@ class BindTests: XCTestCase {
         XCTAssertEqual(byteBuffer.readableBytes, 37)
         XCTAssertEqual(PSQLFrontendMessage.ID.bind.rawValue, byteBuffer.readInteger(as: UInt8.self))
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), 36)
-        XCTAssertEqual("", byteBuffer.readNullTerminatedString())
-        XCTAssertEqual("", byteBuffer.readNullTerminatedString())
+        XCTAssertEqual("", byteBuffer.psqlReadNullTerminatedString())
+        XCTAssertEqual("", byteBuffer.psqlReadNullTerminatedString())
         // the number of parameters
         XCTAssertEqual(2, byteBuffer.readInteger(as: Int16.self))
         // all (two) parameters have the same format (binary)
diff --git a/Tests/PostgresNIOTests/New/Messages/CloseTests.swift b/Tests/PostgresNIOTests/New/Messages/CloseTests.swift
index 4df15896..8f8af2bd 100644
--- a/Tests/PostgresNIOTests/New/Messages/CloseTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/CloseTests.swift
@@ -14,7 +14,7 @@ class CloseTests: XCTestCase {
         XCTAssertEqual(PSQLFrontendMessage.ID.close.rawValue, byteBuffer.readInteger(as: UInt8.self))
         XCTAssertEqual(11, byteBuffer.readInteger(as: Int32.self))
         XCTAssertEqual(UInt8(ascii: "P"), byteBuffer.readInteger(as: UInt8.self))
-        XCTAssertEqual("Hello", byteBuffer.readNullTerminatedString())
+        XCTAssertEqual("Hello", byteBuffer.psqlReadNullTerminatedString())
         XCTAssertEqual(byteBuffer.readableBytes, 0)
     }
     
@@ -28,7 +28,7 @@ class CloseTests: XCTestCase {
         XCTAssertEqual(PSQLFrontendMessage.ID.close.rawValue, byteBuffer.readInteger(as: UInt8.self))
         XCTAssertEqual(6, byteBuffer.readInteger(as: Int32.self))
         XCTAssertEqual(UInt8(ascii: "S"), byteBuffer.readInteger(as: UInt8.self))
-        XCTAssertEqual("", byteBuffer.readNullTerminatedString())
+        XCTAssertEqual("", byteBuffer.psqlReadNullTerminatedString())
         XCTAssertEqual(byteBuffer.readableBytes, 0)
     }
     
diff --git a/Tests/PostgresNIOTests/New/Messages/DescribeTests.swift b/Tests/PostgresNIOTests/New/Messages/DescribeTests.swift
index 87f7d09b..fabb0e29 100644
--- a/Tests/PostgresNIOTests/New/Messages/DescribeTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/DescribeTests.swift
@@ -14,7 +14,7 @@ class DescribeTests: XCTestCase {
         XCTAssertEqual(PSQLFrontendMessage.ID.describe.rawValue, byteBuffer.readInteger(as: UInt8.self))
         XCTAssertEqual(11, byteBuffer.readInteger(as: Int32.self))
         XCTAssertEqual(UInt8(ascii: "P"), byteBuffer.readInteger(as: UInt8.self))
-        XCTAssertEqual("Hello", byteBuffer.readNullTerminatedString())
+        XCTAssertEqual("Hello", byteBuffer.psqlReadNullTerminatedString())
         XCTAssertEqual(byteBuffer.readableBytes, 0)
     }
     
@@ -28,7 +28,7 @@ class DescribeTests: XCTestCase {
         XCTAssertEqual(PSQLFrontendMessage.ID.describe.rawValue, byteBuffer.readInteger(as: UInt8.self))
         XCTAssertEqual(6, byteBuffer.readInteger(as: Int32.self))
         XCTAssertEqual(UInt8(ascii: "S"), byteBuffer.readInteger(as: UInt8.self))
-        XCTAssertEqual("", byteBuffer.readNullTerminatedString())
+        XCTAssertEqual("", byteBuffer.psqlReadNullTerminatedString())
         XCTAssertEqual(byteBuffer.readableBytes, 0)
     }
 
diff --git a/Tests/PostgresNIOTests/New/Messages/ErrorResponseTests.swift b/Tests/PostgresNIOTests/New/Messages/ErrorResponseTests.swift
index bbc945e4..df0d63b0 100644
--- a/Tests/PostgresNIOTests/New/Messages/ErrorResponseTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/ErrorResponseTests.swift
@@ -19,7 +19,7 @@ class ErrorResponseTests: XCTestCase {
         let buffer = ByteBuffer.backendMessage(id: .error) { buffer in
             fields.forEach { (key, value) in
                 buffer.writeInteger(key.rawValue, as: UInt8.self)
-                buffer.writeNullTerminatedString(value)
+                buffer.psqlWriteNullTerminatedString(value)
             }
             buffer.writeInteger(0, as: UInt8.self) // signal done
         }
diff --git a/Tests/PostgresNIOTests/New/Messages/ExecuteTests.swift b/Tests/PostgresNIOTests/New/Messages/ExecuteTests.swift
index 3ce8d63d..0969194c 100644
--- a/Tests/PostgresNIOTests/New/Messages/ExecuteTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/ExecuteTests.swift
@@ -13,7 +13,7 @@ class ExecuteTests: XCTestCase {
         XCTAssertEqual(byteBuffer.readableBytes, 10) // 1 (id) + 4 (length) + 1 (empty null terminated string) + 4 (count)
         XCTAssertEqual(PSQLFrontendMessage.ID.execute.rawValue, byteBuffer.readInteger(as: UInt8.self))
         XCTAssertEqual(9, byteBuffer.readInteger(as: Int32.self)) // length
-        XCTAssertEqual("", byteBuffer.readNullTerminatedString())
+        XCTAssertEqual("", byteBuffer.psqlReadNullTerminatedString())
         XCTAssertEqual(0, byteBuffer.readInteger(as: Int32.self))
     }
 }
diff --git a/Tests/PostgresNIOTests/New/Messages/NotificationResponseTests.swift b/Tests/PostgresNIOTests/New/Messages/NotificationResponseTests.swift
index 39fbb220..abf6b4ed 100644
--- a/Tests/PostgresNIOTests/New/Messages/NotificationResponseTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/NotificationResponseTests.swift
@@ -20,8 +20,8 @@ class NotificationResponseTests: XCTestCase {
             
             buffer.writeBackendMessage(id: .notificationResponse) { buffer in
                 buffer.writeInteger(notification.backendPID)
-                buffer.writeNullTerminatedString(notification.channel)
-                buffer.writeNullTerminatedString(notification.payload)
+                buffer.psqlWriteNullTerminatedString(notification.channel)
+                buffer.psqlWriteNullTerminatedString(notification.payload)
             }
         }
         
@@ -49,7 +49,7 @@ class NotificationResponseTests: XCTestCase {
         var buffer = ByteBuffer()
         buffer.writeBackendMessage(id: .notificationResponse) { buffer in
             buffer.writeInteger(Int32(123))
-            buffer.writeNullTerminatedString("hello")
+            buffer.psqlWriteNullTerminatedString("hello")
             buffer.writeString("world")
         }
         
diff --git a/Tests/PostgresNIOTests/New/Messages/ParameterStatusTests.swift b/Tests/PostgresNIOTests/New/Messages/ParameterStatusTests.swift
index db4963e0..2f00fa53 100644
--- a/Tests/PostgresNIOTests/New/Messages/ParameterStatusTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/ParameterStatusTests.swift
@@ -27,8 +27,8 @@ class ParameterStatusTests: XCTestCase {
             switch message {
             case .parameterStatus(let parameterStatus):
                 buffer.writeBackendMessage(id: .parameterStatus) { buffer in
-                    buffer.writeNullTerminatedString(parameterStatus.parameter)
-                    buffer.writeNullTerminatedString(parameterStatus.value)
+                    buffer.psqlWriteNullTerminatedString(parameterStatus.parameter)
+                    buffer.psqlWriteNullTerminatedString(parameterStatus.value)
                 }
             case .backendKeyData(let backendKeyData):
                 buffer.writeBackendMessage(id: .backendKeyData) { buffer in
@@ -62,7 +62,7 @@ class ParameterStatusTests: XCTestCase {
     func testDecodeFailureBecauseOfMissingNullTerminationInValue() {
         var buffer = ByteBuffer()
         buffer.writeBackendMessage(id: .parameterStatus) { buffer in
-            buffer.writeNullTerminatedString("DateStyle")
+            buffer.psqlWriteNullTerminatedString("DateStyle")
             buffer.writeString("ISO, MDY")
         }
         
diff --git a/Tests/PostgresNIOTests/New/Messages/ParseTests.swift b/Tests/PostgresNIOTests/New/Messages/ParseTests.swift
index c147b749..3393e74d 100644
--- a/Tests/PostgresNIOTests/New/Messages/ParseTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/ParseTests.swift
@@ -24,8 +24,8 @@ class ParseTests: XCTestCase {
         XCTAssertEqual(byteBuffer.readableBytes, length)
         XCTAssertEqual(byteBuffer.readInteger(as: UInt8.self), PSQLFrontendMessage.ID.parse.rawValue)
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), Int32(length - 1))
-        XCTAssertEqual(byteBuffer.readNullTerminatedString(), parse.preparedStatementName)
-        XCTAssertEqual(byteBuffer.readNullTerminatedString(), parse.query)
+        XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), parse.preparedStatementName)
+        XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), parse.query)
         XCTAssertEqual(byteBuffer.readInteger(as: Int16.self), Int16(parse.parameters.count))
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), PSQLDataType.bool.rawValue)
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), PSQLDataType.int8.rawValue)
diff --git a/Tests/PostgresNIOTests/New/Messages/PasswordTests.swift b/Tests/PostgresNIOTests/New/Messages/PasswordTests.swift
index 73c464f3..f7876426 100644
--- a/Tests/PostgresNIOTests/New/Messages/PasswordTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/PasswordTests.swift
@@ -16,6 +16,6 @@ class PasswordTests: XCTestCase {
         XCTAssertEqual(byteBuffer.readableBytes, expectedLength)
         XCTAssertEqual(byteBuffer.readInteger(as: UInt8.self), PSQLFrontendMessage.ID.password.rawValue)
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), Int32(expectedLength - 1)) // length
-        XCTAssertEqual(byteBuffer.readNullTerminatedString(), "md522d085ed8dc3377968dc1c1a40519a2a")
+        XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), "md522d085ed8dc3377968dc1c1a40519a2a")
     }
 }
diff --git a/Tests/PostgresNIOTests/New/Messages/RowDescriptionTests.swift b/Tests/PostgresNIOTests/New/Messages/RowDescriptionTests.swift
index 8eba059d..ba759dc4 100644
--- a/Tests/PostgresNIOTests/New/Messages/RowDescriptionTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/RowDescriptionTests.swift
@@ -25,7 +25,7 @@ class RowDescriptionTests: XCTestCase {
                 buffer.writeInteger(Int16(description.columns.count))
                 
                 description.columns.forEach { column in
-                    buffer.writeNullTerminatedString(column.name)
+                    buffer.psqlWriteNullTerminatedString(column.name)
                     buffer.writeInteger(column.tableOID)
                     buffer.writeInteger(column.columnAttributeNumber)
                     buffer.writeInteger(column.dataType.rawValue)
@@ -70,7 +70,7 @@ class RowDescriptionTests: XCTestCase {
         
         var buffer = ByteBuffer()
         buffer.writeBackendMessage(id: .rowDescription) { buffer in
-            buffer.writeNullTerminatedString(column.name)
+            buffer.psqlWriteNullTerminatedString(column.name)
             buffer.writeInteger(column.tableOID)
             buffer.writeInteger(column.columnAttributeNumber)
             buffer.writeInteger(column.dataType.rawValue)
@@ -93,7 +93,7 @@ class RowDescriptionTests: XCTestCase {
         var buffer = ByteBuffer()
         buffer.writeBackendMessage(id: .rowDescription) { buffer in
             buffer.writeInteger(Int16(1))
-            buffer.writeNullTerminatedString(column.name)
+            buffer.psqlWriteNullTerminatedString(column.name)
             buffer.writeInteger(column.tableOID)
             buffer.writeInteger(column.columnAttributeNumber)
             buffer.writeInteger(column.dataType.rawValue)
@@ -116,7 +116,7 @@ class RowDescriptionTests: XCTestCase {
         var buffer = ByteBuffer()
         buffer.writeBackendMessage(id: .rowDescription) { buffer in
             buffer.writeInteger(Int16(-1))
-            buffer.writeNullTerminatedString(column.name)
+            buffer.psqlWriteNullTerminatedString(column.name)
             buffer.writeInteger(column.tableOID)
             buffer.writeInteger(column.columnAttributeNumber)
             buffer.writeInteger(column.dataType.rawValue)
diff --git a/Tests/PostgresNIOTests/New/Messages/SASLInitialResponseTests.swift b/Tests/PostgresNIOTests/New/Messages/SASLInitialResponseTests.swift
index af2459ac..3c4ae4b3 100644
--- a/Tests/PostgresNIOTests/New/Messages/SASLInitialResponseTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/SASLInitialResponseTests.swift
@@ -23,7 +23,7 @@ class SASLInitialResponseTests: XCTestCase {
         XCTAssertEqual(byteBuffer.readableBytes, length)
         XCTAssertEqual(byteBuffer.readInteger(as: UInt8.self), PSQLFrontendMessage.ID.saslInitialResponse.rawValue)
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), Int32(length - 1))
-        XCTAssertEqual(byteBuffer.readNullTerminatedString(), sasl.saslMechanism)
+        XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), sasl.saslMechanism)
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), Int32(sasl.initialData.count))
         XCTAssertEqual(byteBuffer.readBytes(length: sasl.initialData.count), sasl.initialData)
         XCTAssertEqual(byteBuffer.readableBytes, 0)
@@ -48,7 +48,7 @@ class SASLInitialResponseTests: XCTestCase {
         XCTAssertEqual(byteBuffer.readableBytes, length)
         XCTAssertEqual(byteBuffer.readInteger(as: UInt8.self), PSQLFrontendMessage.ID.saslInitialResponse.rawValue)
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), Int32(length - 1))
-        XCTAssertEqual(byteBuffer.readNullTerminatedString(), sasl.saslMechanism)
+        XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), sasl.saslMechanism)
         XCTAssertEqual(byteBuffer.readInteger(as: Int32.self), Int32(-1))
         XCTAssertEqual(byteBuffer.readableBytes, 0)
     }
diff --git a/Tests/PostgresNIOTests/New/Messages/StartupTests.swift b/Tests/PostgresNIOTests/New/Messages/StartupTests.swift
index 1224aede..ee63ea1a 100644
--- a/Tests/PostgresNIOTests/New/Messages/StartupTests.swift
+++ b/Tests/PostgresNIOTests/New/Messages/StartupTests.swift
@@ -29,15 +29,15 @@ class StartupTests: XCTestCase {
             let byteBufferLength = Int32(byteBuffer.readableBytes)
             XCTAssertEqual(byteBufferLength, byteBuffer.readInteger())
             XCTAssertEqual(startup.protocolVersion, byteBuffer.readInteger())
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "user")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "test")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "database")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "abc123")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "options")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "some options")
+            XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), "user")
+            XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), "test")
+            XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), "database")
+            XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), "abc123")
+            XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), "options")
+            XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), "some options")
             if replication != .false {
-                XCTAssertEqual(byteBuffer.readNullTerminatedString(), "replication")
-                XCTAssertEqual(byteBuffer.readNullTerminatedString(), replication.stringValue)
+                XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), "replication")
+                XCTAssertEqual(byteBuffer.psqlReadNullTerminatedString(), replication.stringValue)
             }
             XCTAssertEqual(byteBuffer.readInteger(), UInt8(0))
             
diff --git a/Tests/PostgresNIOTests/New/PSQLBackendMessageTests.swift b/Tests/PostgresNIOTests/New/PSQLBackendMessageTests.swift
index 049e23d1..0f486180 100644
--- a/Tests/PostgresNIOTests/New/PSQLBackendMessageTests.swift
+++ b/Tests/PostgresNIOTests/New/PSQLBackendMessageTests.swift
@@ -90,8 +90,8 @@ class PSQLBackendMessageTests: XCTestCase {
         
         parameterStatus.forEach { parameterStatus in
             buffer.writeBackendMessage(id: .parameterStatus) { buffer in
-                buffer.writeNullTerminatedString(parameterStatus.parameter)
-                buffer.writeNullTerminatedString(parameterStatus.value)
+                buffer.psqlWriteNullTerminatedString(parameterStatus.parameter)
+                buffer.psqlWriteNullTerminatedString(parameterStatus.value)
             }
             
             expectedMessages.append(.parameterStatus(parameterStatus))
@@ -132,7 +132,7 @@ class PSQLBackendMessageTests: XCTestCase {
         buffer.writeBackendMessage(id: .noticeResponse) { buffer in
             fields.forEach { (key, value) in
                 buffer.writeInteger(key.rawValue, as: UInt8.self)
-                buffer.writeNullTerminatedString(value)
+                buffer.psqlWriteNullTerminatedString(value)
             }
             buffer.writeInteger(0, as: UInt8.self) // signal done
         }
@@ -216,7 +216,7 @@ class PSQLBackendMessageTests: XCTestCase {
             }
             
             okBuffer.writeBackendMessage(id: .commandComplete) { buffer in
-                buffer.writeNullTerminatedString(commandTag)
+                buffer.psqlWriteNullTerminatedString(commandTag)
             }
         }