help fix namespace collisions