Fix for non-inverted names.