Updated the named with the ones bailopan suggested.