gustafn
committed
on 15 Apr 10
consolidate naming