Fix naming colision