Do some renaming suggested by recent DB-SIG discussions.
This should not break anything unless you are using private members.
Authored by: adustman 2001-10-25
Parent: [r191]
Child: [r193]
