infrastructure renamed to rest