rename function and add thai name support