Fix extra names case