Function names updates as per java conventions.