Change names

fixes #189