Rename recipes yet again, add in some compatibility for OSX