diff --git a/swh/graphql/app.py b/swh/graphql/app.py
index 71d7269..ff3b455 100644
--- a/swh/graphql/app.py
+++ b/swh/graphql/app.py
@@ -1,27 +1,27 @@
 from ariadne import gql, load_schema_from_path, make_executable_schema
 
 from .resolvers import resolvers, scalars
 
 type_defs = gql(load_schema_from_path("swh/graphql/schema/schema.graphql"))
 
 schema = make_executable_schema(
     type_defs,
     resolvers.query,
     resolvers.origin,
     resolvers.visit,
     resolvers.visit_status,
     resolvers.snapshot,
     resolvers.snapshot_branch,
     resolvers.revision,
     resolvers.release,
     resolvers.directory,
     resolvers.directory_entry,
     resolvers.branch_target,
     resolvers.release_target,
     resolvers.directory_entry_target,
     scalars.id_scalar,
+    scalars.string_scalar,
     scalars.datetime_scalar,
     scalars.swhid_scalar,
     scalars.hash_value_scalar,
-    scalars.binary_string_scalar,
 )
diff --git a/swh/graphql/resolvers/scalars.py b/swh/graphql/resolvers/scalars.py
index e5d5051..b615900 100644
--- a/swh/graphql/resolvers/scalars.py
+++ b/swh/graphql/resolvers/scalars.py
@@ -1,50 +1,52 @@
 from datetime import datetime
 
 from ariadne import ScalarType
 
 from swh.graphql.utils import utils
 from swh.model.model import TimestampWithTimezone
 from swh.model.swhids import CoreSWHID
 
 datetime_scalar = ScalarType("DateTime")
 swhid_scalar = ScalarType("SWHID")
 hash_value_scalar = ScalarType("HashValue")
-binary_string_scalar = ScalarType("BinaryString")
 id_scalar = ScalarType("ID")
+string_scalar = ScalarType("String")
 
 
 @id_scalar.serializer
 def serialize_id(value):
     if type(value) is bytes:
         return value.hex()
     return value
 
 
+@string_scalar.serializer
+def serialize_string(value):
+    if type(value) is bytes:
+        return value.decode("utf-8")
+    return value
+
+
 @hash_value_scalar.serializer
 def serialize_hash_value(value):
     return value.hex()
 
 
-@binary_string_scalar.serializer
-def serialize_binary_string(value):
-    return value.decode("utf-8")
-
-
 @datetime_scalar.serializer
 def serialize_datetime(value):
     # FIXME, handle error and return None
     if type(value) == TimestampWithTimezone:
         value = value.to_datetime()
     if type(value) == datetime:
         return utils.get_formatted_date(value)
     return None
 
 
 @swhid_scalar.value_parser
 def validate_swhid(value):
     return CoreSWHID.from_string(value)
 
 
 @swhid_scalar.serializer
 def serialize_swhid(value):
     return str(value)
diff --git a/swh/graphql/schema/schema.graphql b/swh/graphql/schema/schema.graphql
index 96b1a7e..8499a54 100644
--- a/swh/graphql/schema/schema.graphql
+++ b/swh/graphql/schema/schema.graphql
@@ -1,343 +1,341 @@
 scalar SWHID
 
 scalar HashValue
 
 scalar DateTime
 
-scalar BinaryString
-
 interface Node {
   id: ID!
 }
 
 interface SWHNode {
   SWHID: SWHID!
 }
 
 type PageInfo {
   endCursor: String
   hasNextPage: Boolean!
 }
 
 type OriginConnection {
   edges: [OriginEdge]
   nodes: [Origin]
   pageInfo: PageInfo!
   totalCount: Int
 }
 
 type OriginEdge {
   cursor: String!
   node: Origin
 }
 
 type Origin implements Node {
   id: ID!
   url: String!
   visits(
     first: Int!
     after: String
   ): VisitConnection!
   latestVisit: Visit
   snapshots(
     first: Int!
     after: String
   ): SnapshotConnection
 }
 
 type VisitConnection {
   edges: [VisitEdge]
   nodes: [Visit]
   pageInfo: PageInfo!
   totalCount: Int
 }
 
 type VisitEdge {
   cursor: String!
   node: Visit
 }
 
 type Visit implements Node {
   id: ID!
   visitId: Int
   date: DateTime!
   type: String
   status(
     first: Int
     after: String
   ): VisitStatusConnection
   latestStatus: VisitStatus
 }
 
 type VisitStatusConnection {
   edges: [VisitStatusEdge]
   nodes: [VisitStatus]
   pageInfo: PageInfo!
   totalCount: Int
 }
 
 type VisitStatusEdge {
   cursor: String!
   node: VisitStatus
 }
 
 type VisitStatus {
   status: String!
   date: DateTime!
   snapshotId: HashValue
   snapshot: Snapshot
   type: String
 }
 
 type SnapshotConnection {
   edges: [SnapshotEdge]
   nodes: [Snapshot]
   pageInfo: PageInfo!
   totalCount: Int
 }
 
 type SnapshotEdge {
   cursor: String!
   node: Snapshot
 }
 
 type Snapshot implements SWHNode & Node {
   id: ID!
   SWHID: SWHID!
 
   branches(
     first: Int!
     after: String
     types: [BranchTypes]
     nameInclude: String
   ): BranchConnection
 }
 
 type BranchConnection {
   edges: [BranchConnectionEdge]
   nodes: [Branch]
   pageInfo: PageInfo!
   totalCount: Int
 }
 
 type BranchConnectionEdge {
   cursor: String!
   node: Branch
 }
 
 type Person {
-  email: BinaryString
-  name: BinaryString
-  fullname: BinaryString
+  email: String
+  name: String
+  fullname: String
 }
 
 # FIXME, this can be Content, Directory, Snapshot, or Alias as well
 union BranchTarget = Revision | Release
 
 enum BranchTypes {
   revision
   release
   alias
   content
   directory
   snapshot
 }
 
 type Branch {
-  name: BinaryString
+  name: String
   type: BranchTypes
   targetId: HashValue
   target: BranchTarget
 }
 
 type RevisionConnection {
   edges: [RevisionEdge]
   nodes: [Revision]
   pageInfo: PageInfo!
   totalCount: Int
 }
 
 type RevisionEdge {
   cursor: String!
   node: Revision
 }
 
 type Revision implements SWHNode & Node {
   id: ID!
   SWHID: SWHID!
-  message: BinaryString
+  message: String
   author: Person
   committer: Person
   date: DateTime
   type: String   # Revision type: FIXME, change to an enum
   directoryId: HashValue
   directory: Directory
   parentIds: [HashValue]
   parents(
     first: Int
     after: String
   ): RevisionConnection
   revisionLog(
     first: Int!
     after: String
   ): RevisionConnection
 }
 
 union ReleaseTarget = Release | Revision | Directory | Content
 
 enum ReleaseTargetType {
   release
   revision
   content
   directory
 }
 
 type Release implements SWHNode & Node {
   id: ID!
   SWHID: SWHID!
-  name: BinaryString
-  message: BinaryString
+  name: String
+  message: String
   author: Person
   date: DateTime
   targetId: HashValue
   targetType: ReleaseTargetType
   target: ReleaseTarget
 }
 
 type DirectoryEntryConnection {
   edges: [DirectoryEntryEdge]
   nodes: [DirectoryEntry]
   pageInfo: PageInfo!
   totalCount: Int
 }
 
 type DirectoryEntryEdge {
   cursor: String!
   node: DirectoryEntry
 }
 
 union DirectoryEntryTarget = Directory | Content
 
 enum DirectoryEntryType {
   dir
   file
   rev
 }
 
 type DirectoryEntry {
-  name: BinaryString
+  name: String
   type: DirectoryEntryType
   targetId: HashValue
   target: DirectoryEntryTarget
 }
 
 type Directory implements SWHNode & Node {
   id: ID!
   SWHID: SWHID!
   entries(
     first: Int
     after: String
   ): DirectoryEntryConnection
 }
 
 type ContentChecksum {  # FIXME, temp types
   blake2s256: HashValue
   sha1: HashValue
   sha1_git: HashValue
   sha256: HashValue
 }
 
 # type ContentType {
 #   test: String
 # }
 
 # type ContentLanguage {
 #   test: String
 # }
 
 # type ContentLicense {
 #   test: String
 # }
 
 type Content implements SWHNode & Node {
   id: ID!
   SWHID: SWHID!
   checksum: ContentChecksum
   # data:
   # filetype: ContentType
   # language: ContentLanguage
   # license: ContentLicense
   length: Int
   status: String
-  data: BinaryString
+  data: String
 }
 
 type Query {
   """
   Get an origin with its url
   """
   origin(
     url: String!
   ): Origin
 
   """
   Get a list of origins
   matching the given filters
   Can also be used to search for an origin
   """
   # FIMXE, use Input types to make this cleaner
   origins(
     first: Int!
     after: String
     urlPattern: String
   ): OriginConnection
 
   """
   Get a visit object with its id
   and/or origin and visit id
   """
   visit(
     originUrl: String!
     visitId: Int!
   ): Visit
 
   """
   Get a snapshot with Sha1
   """
   snapshot(
     SWHID: SWHID!
   ): Snapshot
 
   """
   Get the revision with the given Sha1
   """
   revision(
     SWHID: SWHID!
   ): Revision
 
   """
   Get the release with the given Sha1
   """
   release(
     SWHID: SWHID!
   ): Release
 
   """
   Get the directory with the given Sha1
   """
   directory(
     SWHID: SWHID!
   ): Directory
 
   """
   Get the content with the given Sha1
   """
   content(
     SWHID: SWHID!
   ): Content
 
   # """
   # Search with the given swhid
   # """
   # searchWithSwhid
 }