IW: Update var names in make file