Fix canned
Fix naming, use arara to clean