Improve naming (fix #50)

Fix #50.