Renamed a number of methods that should obviously be using the fluent
style to conform to the rest of the API.