renaming (mostly removing prefix) functions to be more intuitive