#50 rename module names