project rename and optimize same code