name changes fir ip conversion, test fixes