Changed function names

No reason to ever use Strings