#3: fix some names