Fix naming issues

see #163