Version2 working

Legacy concern. type ~= typeId, but not in all old cases. type should be eventually dropped. typeName is formatted.