RE: Clearer names -- yea that seems good.

RE: the parameter order, since it follows the ordering of the other methods in the file I think it's fine.