Handle newer naming convention for Kepler