Naming update

Updated main