diff --git a/CMakeLists.txt b/CMakeLists.txt
index d535674..5d0b4ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,7 +217,7 @@ if(WIDGETS_GUI OR QUICK_GUI)
 endif()
 
 # find tagparser
-find_package(tagparser 6.4.0 REQUIRED)
+find_package(tagparser 7.0.0 REQUIRED)
 use_tag_parser()
 list(APPEND TEST_LIBRARIES ${TAG_PARSER_SHARED_LIB})
 
diff --git a/cli/helper.cpp b/cli/helper.cpp
index eacdb65..e28f733 100644
--- a/cli/helper.cpp
+++ b/cli/helper.cpp
@@ -554,7 +554,7 @@ std::vector<const TagValue *> valuesForNativeField(const char *idString, std::si
     if(tagType != ConcreteTag::tagType) {
         return vector<const TagValue *>();
     }
-    return static_cast<const ConcreteTag *>(tag)->values(ConcreteTag::fieldType::fieldIdFromString(idString, idStringSize));
+    return static_cast<const ConcreteTag *>(tag)->values(ConcreteTag::FieldType::fieldIdFromString(idString, idStringSize));
 }
 
 template<class ConcreteTag>
@@ -563,7 +563,7 @@ bool setValuesForNativeField(const char *idString, std::size_t idStringSize, Tag
     if(tagType != ConcreteTag::tagType) {
         return false;
     }
-    return static_cast<ConcreteTag *>(tag)->setValues(ConcreteTag::fieldType::fieldIdFromString(idString, idStringSize), values);
+    return static_cast<ConcreteTag *>(tag)->setValues(ConcreteTag::FieldType::fieldIdFromString(idString, idStringSize), values);
 }
 
 inline FieldId::FieldId(const char *nativeField, std::size_t nativeFieldSize, const GetValuesForNativeFieldType &valuesForNativeField, const SetValuesForNativeFieldType &setValuesForNativeField) :
diff --git a/gui/picturepreviewselection.cpp b/gui/picturepreviewselection.cpp
index 45f0e1b..68de3ab 100644
--- a/gui/picturepreviewselection.cpp
+++ b/gui/picturepreviewselection.cpp
@@ -95,9 +95,9 @@ void PicturePreviewSelection::setValue(const TagValue &value, PreviousValueHandl
  * \brief Defines the predicate to get relevant fields.
  */
 template<class TagType>
-bool fieldPredicate(int i, const std::pair<typename TagType::fieldType::identifierType, typename TagType::fieldType> &pair)
+bool fieldPredicate(int i, const std::pair<typename TagType::IdentifierType, typename TagType::FieldType> &pair)
 {
-    return pair.second.isTypeInfoAssigned() ? (pair.second.typeInfo() == static_cast<unsigned int>(i)) : (i == 0);
+    return pair.second.isTypeInfoAssigned() ? (pair.second.typeInfo() == static_cast<typename TagType::FieldType::TypeInfoType>(i)) : (i == 0);
 }
 
 /*!
@@ -251,8 +251,8 @@ void pushId3v2CoverValues(TagType *tag, KnownField field, const QList<Media::Tag
                 pair->second.setValue(TagValue());
             }
         } else if(!values[index].isEmpty()) {
-            typename TagType::fieldType field(id, values[index]);
-            field.setTypeInfo(static_cast<decltype(field.typeInfo())>(index));
+            typename TagType::FieldType field(id, values[index]);
+            field.setTypeInfo(index);
             fields.insert(std::make_pair(id, field));
         }
     }
diff --git a/misc/htmlinfo.cpp b/misc/htmlinfo.cpp
index f1caf7c..c153891 100644
--- a/misc/htmlinfo.cpp
+++ b/misc/htmlinfo.cpp
@@ -804,7 +804,7 @@ public:
     {
         mkElementNode(container->firstElement());
         for(auto &element : container->additionalElements()) {
-            mkElementNode<typename ContainerType::elementType, true>(element.get());
+            mkElementNode<typename ContainerType::ContainerElementType, true>(element.get());
         }
     }