new names for lots of new functions
19 files changed