Changed names for consistency