Rename some methods and funcs since we are here

Very probably some of these can be made private.