Changed names for consistency with Java version