Fix table vs. mv name colision