make module names consistent