Merge "Stop using AlgNameMapper"