fix names collision