fix names, fixes #7

Try to fix names automatically. Give warnings as well.