plus small rename test in main