Modify to fix names with --