Revert "Revert "recipes and renaming""

This reverts commit 1dade4333b426e40d3765d344f81a6c31a4f8b3c.