Switch .cap to .rake and update comments