fixed colliding names error