rename functions

Removed strange code at the end of file.  It shouldn't be there.