Fix name encoding I guess?