rename Documentation types, fix compile errors.