Updated method names to match c file