Changed some string function names