Renames to be more in line with java impl