rename functions to more understandable names
27 files changed