MNT: Renamed dict keys to match rename of inputs