make naming consistent. fixes #247