Refactor with better naming for low level methods.
A few more method renames.