improve rename module regarding