Changed names to match library for consistency