change attributes name
change names and add test
change var names and add test