naming

changed some names