update naming. fixes #1 fixes #2.