modified all names to conventions