refacotring main names