Renaming is done

Everything is functional