Changed names to match function