added overall type markup, changed type markup to typeName