Revert "recipes and renaming"

This reverts commit 83889333ac63c54eb6e5c68dedce730376f079b0.