Rename some functions so they match the Java better.