Conform to updated naming.