Make internal and external names of module match