Commit a1fe61f222afed69930b4cae6c328b68838badc2

henry 2002-12-19T10:27:50

Refactored function names