INFR-25347 - Rename