Fixed unsupported characters and added names.