Changed some more strings and function names