Machine renamed to Machines for Controller and Repository