Resolved unicode name issues

- Removed unicode from naming