Fixing issue with names.  Need more tests here.