 }
 
 extension NSNull: DatabaseValueConvertible {
-	public func toDatabaseValue() -> DatabaseValue {
+	public func databaseValue() -> DatabaseValue {
 		return DatabaseValue.null
 	}
 
-	public static func fromDatabaseValue(_ value: DatabaseValue) throws -> Self? {
+	public static func from(databaseValue value: DatabaseValue) throws -> Self? {
 		switch value {
 		case .null:
 			return self.init()

		}
	}

	public static func fromDatabaseValue(_ value: DatabaseValue) -> Self? {
		switch value {
		case .integer(let i):
			return self.init(value: i)

}

extension NSNumber: DatabaseValueConvertible {
	public func databaseValue() -> DatabaseValue {
		switch CFNumberGetType(self as CFNumber) {
		case .sInt8Type, .sInt16Type, .sInt32Type, .charType, .shortType, .intType,
		     .sInt64Type, .longType, .longLongType, .cfIndexType, .nsIntegerType:
