change mapping to unicode names and refactor