Rename some function to be more descriptive and consistent

Starting writing some documentation