Fix names collision