Improve naming (fix #50)