remaining cleanup, cookbook rename