small Name fixups and add it into AMF (WIP)