Renaming of various functions improving usability

Also, general improvement to usability on the client side