few modification in names