few changes related with names