Add in unicode handling for names.