These name mappings should be kept and moved to the new implementation