Switch to latest ESR naming