Fixes to do with names

This should fix #100 and #84.