Renamed two util functions to better names and be clearer in versioning test comments.