Renaming - Cato to 'automate' where appropriate