Using UTF-8

Rename functions