Adapt lookup names to new more general encoding name normalization

scheme.