Changed names to reflect recent name changes