Oops, renamed a couple of functions which shouldn't have been renamed!