updating to prevent namespace collisions