updated names

should close #3