fix names
inc counter