diff --git a/spa/include/spa/buffer/buffer.h b/spa/include/spa/buffer/buffer.h
index 3f7e4b213..962f4ea58 100644
--- a/spa/include/spa/buffer/buffer.h
+++ b/spa/include/spa/buffer/buffer.h
@@ -34,6 +34,7 @@ extern "C" {
  */
 
 enum spa_data_type {
+	SPA_DATA_Invalid,
 	SPA_DATA_MemPtr,		/**< pointer to memory, the data field in
 					  *  struct spa_data is set. */
 	SPA_DATA_MemFd,			/**< generic fd, mmap to get to memory */
diff --git a/spa/include/spa/buffer/meta.h b/spa/include/spa/buffer/meta.h
index b98306b01..6714b94a8 100644
--- a/spa/include/spa/buffer/meta.h
+++ b/spa/include/spa/buffer/meta.h
@@ -31,6 +31,7 @@ extern "C" {
  * Metadata contains extra information on a buffer.
  */
 enum spa_meta_type {
+	SPA_META_Invalid,
 	SPA_META_Header,
 	SPA_META_VideoCrop,
 	SPA_META_VideoDamage,
diff --git a/spa/include/spa/buffer/type-info.h b/spa/include/spa/buffer/type-info.h
index a369ea78f..70191fa35 100644
--- a/spa/include/spa/buffer/type-info.h
+++ b/spa/include/spa/buffer/type-info.h
@@ -40,6 +40,7 @@ extern "C" {
 #define SPA_TYPE_DATA_FD_BASE		SPA_TYPE_DATA__Fd ":"
 
 static const struct spa_type_info spa_type_data_type[] = {
+	{ SPA_DATA_Invalid, SPA_TYPE_DATA_BASE "Invalid", SPA_TYPE_Int, },
 	{ SPA_DATA_MemPtr, SPA_TYPE_DATA_BASE "MemPtr", SPA_TYPE_Int, },
 	{ SPA_DATA_MemFd, SPA_TYPE_DATA_FD_BASE "MemFd", SPA_TYPE_Int, },
 	{ SPA_DATA_DmaBuf, SPA_TYPE_DATA_FD_BASE "DmaBuf", SPA_TYPE_Int, },
@@ -56,6 +57,7 @@ static const struct spa_type_info spa_type_data_type[] = {
 #define SPA_TYPE_META_REGION_ARRAY_BASE	SPA_TYPE_META__RegionArray ":"
 
 static const struct spa_type_info spa_type_meta_type[] = {
+	{ SPA_META_Invalid, SPA_TYPE_META_BASE "Invalid", SPA_TYPE_Pointer },
 	{ SPA_META_Header, SPA_TYPE_META_BASE "Header", SPA_TYPE_Pointer },
 	{ SPA_META_VideoCrop, SPA_TYPE_META_REGION_BASE "VideoCrop", SPA_TYPE_Pointer },
 	{ SPA_META_VideoDamage, SPA_TYPE_META_REGION_ARRAY_BASE "VideoDamage", SPA_TYPE_Pointer },
diff --git a/spa/include/spa/control/control.h b/spa/include/spa/control/control.h
index e3af48226..a8357b184 100644
--- a/spa/include/spa/control/control.h
+++ b/spa/include/spa/control/control.h
@@ -33,8 +33,9 @@ extern "C" {
 
 /** Different Control types */
 enum spa_control_type {
-	SPA_CONTROL_properties,
-	SPA_CONTROL_midi,
+	SPA_CONTROL_Invalid,
+	SPA_CONTROL_Properties,
+	SPA_CONTROL_Midi,
 };
 
 #ifdef __cplusplus
diff --git a/spa/include/spa/debug/format.h b/spa/include/spa/debug/format.h
index e3883d17d..53af841b0 100644
--- a/spa/include/spa/debug/format.h
+++ b/spa/include/spa/debug/format.h
@@ -27,6 +27,7 @@ extern "C" {
 #include <spa/pod/parser.h>
 #include <spa/debug/types.h>
 #include <spa/param/type-info.h>
+#include <spa/param/format-utils.h>
 
 static inline int
 spa_debug_format_value(const struct spa_type_info *info,
@@ -124,16 +125,13 @@ static inline int spa_debug_format(int indent,
 	if (format == NULL || SPA_POD_TYPE(format) != SPA_TYPE_Object)
 		return -EINVAL;
 
-
-
-	if (spa_pod_object_parse(format, "I", &mtype,
-					 "I", &mstype) < 0)
+	if (spa_format_parse(format, &mtype, &mstype) < 0)
 		return -EINVAL;
 
 	media_type = spa_debug_type_find_name(spa_type_media_type, mtype);
 	media_subtype = spa_debug_type_find_name(spa_type_media_subtype, mstype);
 
-	fprintf(stderr, "%-6s %s/%s\n", "",
+	fprintf(stderr, "%*s %s/%s\n", indent, "",
 		media_type ? rindex(media_type, ':') + 1 : "unknown",
 		media_subtype ? rindex(media_subtype, ':') + 1 : "unknown");
 
@@ -153,10 +151,14 @@ static inline int spa_debug_format(int indent,
 		    (prop->body.flags & SPA_POD_PROP_FLAG_OPTIONAL))
 			continue;
 
+		if (prop->body.key == SPA_FORMAT_mediaType ||
+		    prop->body.key == SPA_FORMAT_mediaSubtype)
+			continue;
+
 		ti = spa_debug_type_find(info, prop->body.key);
 		key = ti ? ti->name : NULL;
 
-		fprintf(stderr, "  %20s : (%s) ",
+		fprintf(stderr, "%*s %16s : (%s) ", indent, "",
 			key ? rindex(key, ':') + 1 : "unknown",
 			pod_type_names[prop->body.value.type]);
 
diff --git a/spa/include/spa/monitor/monitor.h b/spa/include/spa/monitor/monitor.h
index 441b5d62c..7e2611dd3 100644
--- a/spa/include/spa/monitor/monitor.h
+++ b/spa/include/spa/monitor/monitor.h
@@ -32,6 +32,7 @@ struct spa_monitor;
 #include <spa/pod/builder.h>
 
 enum spa_monitor_event {
+	SPA_MONITOR_EVENT_Invalid,
 	SPA_MONITOR_EVENT_Added,
 	SPA_MONITOR_EVENT_Removed,
 	SPA_MONITOR_EVENT_Changed,
@@ -46,9 +47,10 @@ enum spa_monitor_item_flags {
 
 /** The monitor item state */
 enum spa_monitor_item_state {
-	SPA_MONITOR_ITEM_STATE_AVAILABLE,	/*< The item is available */
-	SPA_MONITOR_ITEM_STATE_DISABLED,	/*< The item is disabled */
-	SPA_MONITOR_ITEM_STATE_UNAVAILABLE,	/*< The item is unavailable */
+	SPA_MONITOR_ITEM_STATE_Invalid,		/*< The item is available */
+	SPA_MONITOR_ITEM_STATE_Available,	/*< The item is available */
+	SPA_MONITOR_ITEM_STATE_Disabled,	/*< The item is disabled */
+	SPA_MONITOR_ITEM_STATE_Unavailable,	/*< The item is unavailable */
 };
 
 /** properties for SPA_TYPE_OBJECT_MonitorItem */
diff --git a/spa/include/spa/monitor/type-info.h b/spa/include/spa/monitor/type-info.h
index a398a2090..08ce5d0e4 100644
--- a/spa/include/spa/monitor/type-info.h
+++ b/spa/include/spa/monitor/type-info.h
@@ -54,9 +54,9 @@ static const struct spa_type_info spa_type_monitor_item_flags[] = {
 #define SPA_TYPE_MONITOR_ITEM_STATE_BASE	SPA_TYPE__MonitorItemState ":"
 
 static const struct spa_type_info spa_type_monitor_item_state[] = {
-	{ SPA_MONITOR_ITEM_STATE_AVAILABLE,   SPA_TYPE_MONITOR_ITEM_STATE_BASE "available",   SPA_TYPE_Int, },
-	{ SPA_MONITOR_ITEM_STATE_DISABLED,    SPA_TYPE_MONITOR_ITEM_STATE_BASE "disabled",    SPA_TYPE_Int, },
-	{ SPA_MONITOR_ITEM_STATE_UNAVAILABLE, SPA_TYPE_MONITOR_ITEM_STATE_BASE "unavailable", SPA_TYPE_Int, },
+	{ SPA_MONITOR_ITEM_STATE_Available,   SPA_TYPE_MONITOR_ITEM_STATE_BASE "Available",   SPA_TYPE_Int, },
+	{ SPA_MONITOR_ITEM_STATE_Disabled,    SPA_TYPE_MONITOR_ITEM_STATE_BASE "Disabled",    SPA_TYPE_Int, },
+	{ SPA_MONITOR_ITEM_STATE_Unavailable, SPA_TYPE_MONITOR_ITEM_STATE_BASE "Unavailable", SPA_TYPE_Int, },
 	{ 0, NULL, },
 };
 
@@ -64,7 +64,7 @@ static const struct spa_type_info spa_type_monitor_item_state[] = {
 #define SPA_TYPE_MONITOR_ITEM_BASE		SPA_TYPE__MonitorItem ":"
 
 static const struct spa_type_info spa_type_monitor_item[] = {
-	{ SPA_MONITOR_ITEM_START,    SPA_TYPE_MONITOR_ITEM_BASE,           SPA_TYPE_Int, },
+	{ SPA_MONITOR_ITEM_START,   SPA_TYPE_MONITOR_ITEM_BASE,           SPA_TYPE_Int, },
 	{ SPA_MONITOR_ITEM_id,      SPA_TYPE_MONITOR_ITEM_BASE "id",      SPA_TYPE_String, },
 	{ SPA_MONITOR_ITEM_flags,   SPA_TYPE_MONITOR_ITEM_BASE "flags",   SPA_TYPE_Enum,
 		spa_type_monitor_item_flags },
diff --git a/spa/include/spa/node/io.h b/spa/include/spa/node/io.h
index c4c4161b7..754cc15af 100644
--- a/spa/include/spa/node/io.h
+++ b/spa/include/spa/node/io.h
@@ -35,6 +35,7 @@ extern "C" {
 
 /** Different IO area types */
 enum spa_io_type {
+	SPA_IO_Invalid,
 	SPA_IO_Buffers,
 	SPA_IO_Range,
 	SPA_IO_Clock,
diff --git a/spa/include/spa/node/node.h b/spa/include/spa/node/node.h
index 1af3f336e..7107664cf 100644
--- a/spa/include/spa/node/node.h
+++ b/spa/include/spa/node/node.h
@@ -108,12 +108,10 @@ struct spa_node_callbacks {
 };
 
 /** flags that can be passed to set_param and port_set_param functions */
-enum spa_node_param_flags {
-	SPA_NODE_PARAM_FLAG_TEST_ONLY	= (1 << 0),	/* just check if the param is accepted */
-	SPA_NODE_PARAM_FLAG_FIXATE	= (1 << 1),	/* fixate the non-optional unset fields */
-	SPA_NODE_PARAM_FLAG_NEAREST	= (1 << 2),	/* allow set fields to be rounded to the
+#define SPA_NODE_PARAM_FLAG_TEST_ONLY	(1 << 0)	/* just check if the param is accepted */
+#define SPA_NODE_PARAM_FLAG_FIXATE	(1 << 1)	/* fixate the non-optional unset fields */
+#define SPA_NODE_PARAM_FLAG_NEAREST	(1 << 2)	/* allow set fields to be rounded to the
 							 * nearest allowed field value. */
-};
 
 /**
  * A spa_node is a component that can consume and produce buffers.
diff --git a/spa/include/spa/node/type-info.h b/spa/include/spa/node/type-info.h
index a09fbefdd..e61865c86 100644
--- a/spa/include/spa/node/type-info.h
+++ b/spa/include/spa/node/type-info.h
@@ -49,14 +49,14 @@ static const struct spa_type_info spa_type_node_event[] = {
 #define SPA_TYPE_NODE_COMMAND_BASE		SPA_TYPE__NodeCommand ":"
 
 static const struct spa_type_info spa_type_node_command_id[] = {
-	{ SPA_NODE_COMMAND_Suspend,	SPA_TYPE_NODE_COMMAND_BASE "Suspend",   SPA_TYPE_Int, },
+	{ SPA_NODE_COMMAND_Suspend,	SPA_TYPE_NODE_COMMAND_BASE "Suspend", SPA_TYPE_Int, },
 	{ SPA_NODE_COMMAND_Pause,	SPA_TYPE_NODE_COMMAND_BASE "Pause",   SPA_TYPE_Int, },
 	{ SPA_NODE_COMMAND_Start,	SPA_TYPE_NODE_COMMAND_BASE "Start",   SPA_TYPE_Int, },
-	{ SPA_NODE_COMMAND_Enable,	SPA_TYPE_NODE_COMMAND_BASE "Enable",   SPA_TYPE_Int, },
-	{ SPA_NODE_COMMAND_Disable,	SPA_TYPE_NODE_COMMAND_BASE "Disable",   SPA_TYPE_Int, },
+	{ SPA_NODE_COMMAND_Enable,	SPA_TYPE_NODE_COMMAND_BASE "Enable",  SPA_TYPE_Int, },
+	{ SPA_NODE_COMMAND_Disable,	SPA_TYPE_NODE_COMMAND_BASE "Disable", SPA_TYPE_Int, },
 	{ SPA_NODE_COMMAND_Flush,	SPA_TYPE_NODE_COMMAND_BASE "Flush",   SPA_TYPE_Int, },
 	{ SPA_NODE_COMMAND_Drain,	SPA_TYPE_NODE_COMMAND_BASE "Drain",   SPA_TYPE_Int, },
-	{ SPA_NODE_COMMAND_Marker,	SPA_TYPE_NODE_COMMAND_BASE "Marker",   SPA_TYPE_Int, },
+	{ SPA_NODE_COMMAND_Marker,	SPA_TYPE_NODE_COMMAND_BASE "Marker",  SPA_TYPE_Int, },
 	{ 0, NULL, },
 };
 
diff --git a/spa/include/spa/param/audio/format-utils.h b/spa/include/spa/param/audio/format-utils.h
index efb6f85bf..1c39724c0 100644
--- a/spa/include/spa/param/audio/format-utils.h
+++ b/spa/include/spa/param/audio/format-utils.h
@@ -47,8 +47,8 @@ spa_format_audio_raw_build(struct spa_pod_builder *builder, uint32_t id, struct
 {
 	return spa_pod_builder_object(builder,
                         SPA_TYPE_OBJECT_Format, id,
-                        "I", SPA_MEDIA_TYPE_audio,
-                        "I", SPA_MEDIA_SUBTYPE_raw,
+                        ":", SPA_FORMAT_mediaType,	"I", SPA_MEDIA_TYPE_audio,
+                        ":", SPA_FORMAT_mediaSubtype,	"I", SPA_MEDIA_SUBTYPE_raw,
                         ":", SPA_FORMAT_AUDIO_format,   "I", info->format,
                         ":", SPA_FORMAT_AUDIO_layout,   "I", info->layout,
                         ":", SPA_FORMAT_AUDIO_rate,     "i", info->rate,
diff --git a/spa/include/spa/param/audio/raw.h b/spa/include/spa/param/audio/raw.h
index 08208cbe3..1233374db 100644
--- a/spa/include/spa/param/audio/raw.h
+++ b/spa/include/spa/param/audio/raw.h
@@ -122,22 +122,21 @@ enum spa_audio_format {
 };
 
 /** Extra audio flags */
-enum spa_audio_flags {
-	SPA_AUDIO_FLAG_NONE		= 0,		/*< no valid flag */
-	SPA_AUDIO_FLAG_UNPOSITIONED	= (1 << 0),	/*< the position array explicitly
+#define SPA_AUDIO_FLAG_NONE		(0)		/*< no valid flag */
+#define SPA_AUDIO_FLAG_UNPOSITIONED	(1 << 0)	/*< the position array explicitly
 							 *  contains unpositioned channels. */
-};
 
 /** Layout of the audio samples for the different channels.  */
 enum spa_audio_layout {
-	SPA_AUDIO_LAYOUT_INTERLEAVED = 0,	/*< interleaved audio */
-	SPA_AUDIO_LAYOUT_NON_INTERLEAVED	/*< non-interleaved audio */
+	SPA_AUDIO_LAYOUT_INVALID,
+	SPA_AUDIO_LAYOUT_INTERLEAVED,		/*< interleaved audio */
+	SPA_AUDIO_LAYOUT_NON_INTERLEAVED,	/*< non-interleaved audio */
 };
 
 /** Audio information description */
 struct spa_audio_info_raw {
 	enum spa_audio_format format;	/*< format, one of enum spa_audio_format */
-	enum spa_audio_flags flags;	/*< extra flags */
+	uint32_t flags;			/*< extra flags */
 	enum spa_audio_layout layout;	/*< sample layout */
 	uint32_t rate;			/*< sample rate */
 	uint32_t channels;		/*< number of channels */
diff --git a/spa/include/spa/param/audio/type-info.h b/spa/include/spa/param/audio/type-info.h
index 70a2d39e7..6ca641598 100644
--- a/spa/include/spa/param/audio/type-info.h
+++ b/spa/include/spa/param/audio/type-info.h
@@ -78,8 +78,9 @@ static const struct spa_type_info spa_type_audio_flags[] = {
 #define SPA_TYPE_AUDIO_ENUM_BASE	SPA_TYPE__AudioLayout ":"
 
 static const struct spa_type_info spa_type_audio_layout[] = {
-	{ SPA_AUDIO_LAYOUT_INTERLEAVED, SPA_TYPE_AUDIO_ENUM_BASE "interleaved", SPA_TYPE_Int, },
-	{ SPA_AUDIO_LAYOUT_NON_INTERLEAVED, SPA_TYPE_AUDIO_ENUM_BASE "non-interleaved", SPA_TYPE_Int, },
+	{ SPA_AUDIO_LAYOUT_INVALID, SPA_TYPE_AUDIO_ENUM_BASE "Invalid", SPA_TYPE_Int, },
+	{ SPA_AUDIO_LAYOUT_INTERLEAVED, SPA_TYPE_AUDIO_ENUM_BASE "Interleaved", SPA_TYPE_Int, },
+	{ SPA_AUDIO_LAYOUT_NON_INTERLEAVED, SPA_TYPE_AUDIO_ENUM_BASE "Non-Interleaved", SPA_TYPE_Int, },
         { 0, NULL, },
 };
 
diff --git a/spa/include/spa/param/format-utils.h b/spa/include/spa/param/format-utils.h
index 34095b2e9..36fbc2d5b 100644
--- a/spa/include/spa/param/format-utils.h
+++ b/spa/include/spa/param/format-utils.h
@@ -32,8 +32,8 @@ static inline int
 spa_format_parse(const struct spa_pod *format, uint32_t *media_type, uint32_t *media_subtype)
 {
 	return spa_pod_object_parse(format,
-		"I", media_type,
-		"I", media_subtype, NULL);
+		":", SPA_FORMAT_mediaType,    "I", media_type,
+		":", SPA_FORMAT_mediaSubtype, "I", media_subtype, NULL);
 }
 
 #ifdef __cplusplus
diff --git a/spa/include/spa/param/format.h b/spa/include/spa/param/format.h
index dd97e548e..5b97f4732 100644
--- a/spa/include/spa/param/format.h
+++ b/spa/include/spa/param/format.h
@@ -28,7 +28,7 @@ extern "C" {
 
 /** media type for SPA_TYPE_OBJECT_Format */
 enum spa_media_type {
-	SPA_MEDIA_TYPE_START,
+	SPA_MEDIA_TYPE_unknown,
 	SPA_MEDIA_TYPE_audio,
 	SPA_MEDIA_TYPE_video,
 	SPA_MEDIA_TYPE_image,
@@ -38,7 +38,7 @@ enum spa_media_type {
 
 /** media subtype for SPA_TYPE_OBJECT_Format */
 enum spa_media_subtype {
-	SPA_MEDIA_SUBTYPE_START_Generic,
+	SPA_MEDIA_SUBTYPE_unknown,
 	SPA_MEDIA_SUBTYPE_raw,
 
 	SPA_MEDIA_SUBTYPE_START_Audio	= 0x10000,
@@ -83,11 +83,11 @@ enum spa_media_subtype {
 enum spa_format {
 	SPA_FORMAT_START,		/**< id of the object, one of enum spa_param_type */
 
-	SPA_FORMAT_MediaType,		/**< first int in object, one of enum spa_media_type */
-	SPA_FORMAT_MediaSubtype,	/**< second int in object, one of enum spa_media_subtype */
+	SPA_FORMAT_mediaType,		/**< one of enum spa_media_type */
+	SPA_FORMAT_mediaSubtype,	/**< one of enum spa_media_subtype */
 
 	/* Audio format keys */
-	SPA_FORMAT_START_AUDIO,
+	SPA_FORMAT_START_Audio,
 	SPA_FORMAT_AUDIO_format,
 	SPA_FORMAT_AUDIO_flags,
 	SPA_FORMAT_AUDIO_layout,
@@ -96,7 +96,7 @@ enum spa_format {
 	SPA_FORMAT_AUDIO_channelMask,
 
 	/* Video Format keys */
-	SPA_FORMAT_START_VIDEO = 0x10000,
+	SPA_FORMAT_START_Video = 0x10000,
 	SPA_FORMAT_VIDEO_format,
 	SPA_FORMAT_VIDEO_size,
 	SPA_FORMAT_VIDEO_framerate,
@@ -117,11 +117,11 @@ enum spa_format {
 	SPA_FORMAT_VIDEO_alignment,
 
 	/* Image Format keys */
-	SPA_FORMAT_START_IMAGE = 0x20000,
+	SPA_FORMAT_START_Image = 0x20000,
 	/* Binary Format keys */
-	SPA_FORMAT_START_BINARY = 0x30000,
+	SPA_FORMAT_START_Binary = 0x30000,
 	/* Stream Format keys */
-	SPA_FORMAT_START_STREAM = 0x40000,
+	SPA_FORMAT_START_Stream = 0x40000,
 };
 
 #ifdef __cplusplus
diff --git a/spa/include/spa/param/param.h b/spa/include/spa/param/param.h
index 8e604b258..e33382aa7 100644
--- a/spa/include/spa/param/param.h
+++ b/spa/include/spa/param/param.h
@@ -28,7 +28,7 @@ extern "C" {
 
 /** different parameter types that can be queried */
 enum spa_param_type {
-	SPA_PARAM_START,		/**< no value */
+	SPA_PARAM_Invalid,		/**< invalid */
 	SPA_PARAM_List,			/**< available params */
 	SPA_PARAM_PropInfo,		/**< property information */
 	SPA_PARAM_Props,		/**< properties */
diff --git a/spa/include/spa/param/type-info.h b/spa/include/spa/param/type-info.h
index ab771f66b..528a246ef 100644
--- a/spa/include/spa/param/type-info.h
+++ b/spa/include/spa/param/type-info.h
@@ -34,7 +34,7 @@ extern "C" {
 #define SPA_TYPE_PARAM_ID_BASE		SPA_TYPE__ParamId ":"
 
 static const struct spa_type_info spa_type_param[] = {
-	{ SPA_PARAM_START,  "undefined", SPA_TYPE_Int, },
+	{ SPA_PARAM_Invalid, SPA_TYPE_PARAM_ID_BASE "Invalid", SPA_TYPE_Int, },
 	{ SPA_PARAM_List,  SPA_TYPE_PARAM_ID_BASE "List", SPA_TYPE_Int, },
 	{ SPA_PARAM_PropInfo, SPA_TYPE_PARAM_ID_BASE "PropInfo", SPA_TYPE_Int, },
 	{ SPA_PARAM_Props, SPA_TYPE_PARAM_ID_BASE "Props", SPA_TYPE_Int, },
@@ -56,7 +56,7 @@ static const struct spa_type_info spa_type_param[] = {
 
 static const struct spa_type_info spa_type_param_list[] = {
 	{ SPA_PARAM_LIST_START, SPA_TYPE_PARAM_LIST_BASE,  SPA_TYPE_Enum, spa_type_param },
-	{ SPA_PARAM_LIST_id, SPA_TYPE_PARAM_LIST_BASE "id",  SPA_TYPE_Enum, },
+	{ SPA_PARAM_LIST_id, SPA_TYPE_PARAM_LIST_BASE "id",  SPA_TYPE_Enum, spa_type_param },
 	{ 0, NULL, },
 };
 
@@ -141,11 +141,12 @@ static const struct spa_type_info spa_type_param_io[] = {
 #include <spa/param/video/type-info.h>
 
 static const struct spa_type_info spa_type_media_type[] = {
-	{ SPA_MEDIA_TYPE_audio, SPA_TYPE_MEDIA_TYPE_BASE "audio", SPA_TYPE_Int, },
-	{ SPA_MEDIA_TYPE_video, SPA_TYPE_MEDIA_TYPE_BASE "video", SPA_TYPE_Int, },
-	{ SPA_MEDIA_TYPE_image, SPA_TYPE_MEDIA_TYPE_BASE "image", SPA_TYPE_Int, },
-	{ SPA_MEDIA_TYPE_binary, SPA_TYPE_MEDIA_TYPE_BASE "binary", SPA_TYPE_Int, },
-	{ SPA_MEDIA_TYPE_stream, SPA_TYPE_MEDIA_TYPE_BASE "stream", SPA_TYPE_Int, },
+	{ SPA_MEDIA_TYPE_unknown, SPA_TYPE_MEDIA_TYPE_BASE "unknown", SPA_TYPE_Int, },
+	{ SPA_MEDIA_TYPE_audio,   SPA_TYPE_MEDIA_TYPE_BASE "audio",   SPA_TYPE_Int, },
+	{ SPA_MEDIA_TYPE_video,   SPA_TYPE_MEDIA_TYPE_BASE "video",   SPA_TYPE_Int, },
+	{ SPA_MEDIA_TYPE_image,   SPA_TYPE_MEDIA_TYPE_BASE "image",   SPA_TYPE_Int, },
+	{ SPA_MEDIA_TYPE_binary,  SPA_TYPE_MEDIA_TYPE_BASE "binary",  SPA_TYPE_Int, },
+	{ SPA_MEDIA_TYPE_stream,  SPA_TYPE_MEDIA_TYPE_BASE "stream",  SPA_TYPE_Int, },
 	{ 0, NULL, },
 };
 
@@ -153,6 +154,7 @@ static const struct spa_type_info spa_type_media_type[] = {
 #define SPA_TYPE_MEDIA_SUBTYPE_BASE	SPA_TYPE__MediaSubtype ":"
 
 static const struct spa_type_info spa_type_media_subtype[] = {
+	{ SPA_MEDIA_SUBTYPE_unknown, SPA_TYPE_MEDIA_SUBTYPE_BASE "unknown", SPA_TYPE_Int, },
 	/* generic subtypes */
 	{ SPA_MEDIA_SUBTYPE_raw, SPA_TYPE_MEDIA_SUBTYPE_BASE "raw", SPA_TYPE_Int, },
 	/* audio subtypes */
@@ -197,9 +199,9 @@ static const struct spa_type_info spa_type_media_subtype[] = {
 static const struct spa_type_info spa_type_format[] = {
 	{ SPA_FORMAT_START, SPA_TYPE_FORMAT_BASE, SPA_TYPE_Enum, spa_type_param, },
 
-	{ SPA_FORMAT_MediaType, SPA_TYPE_FORMAT_BASE "mediaType", SPA_TYPE_Enum,
+	{ SPA_FORMAT_mediaType, SPA_TYPE_FORMAT_BASE "mediaType", SPA_TYPE_Enum,
 		spa_type_media_type, },
-	{ SPA_FORMAT_MediaSubtype, SPA_TYPE_FORMAT_BASE "mediaSubtype", SPA_TYPE_Enum,
+	{ SPA_FORMAT_mediaSubtype, SPA_TYPE_FORMAT_BASE "mediaSubtype", SPA_TYPE_Enum,
 		spa_type_media_subtype, },
 
 	{ SPA_FORMAT_AUDIO_format, SPA_TYPE_FORMAT_AUDIO_BASE "format", SPA_TYPE_Enum,
diff --git a/spa/include/spa/param/video/format-utils.h b/spa/include/spa/param/video/format-utils.h
index 387bea930..c58a02676 100644
--- a/spa/include/spa/param/video/format-utils.h
+++ b/spa/include/spa/param/video/format-utils.h
@@ -56,8 +56,8 @@ spa_format_video_raw_build(struct spa_pod_builder *builder, uint32_t id,
 {
 	return spa_pod_builder_object(builder,
                         SPA_TYPE_OBJECT_Format, id,
-                        "I", SPA_MEDIA_TYPE_video,
-                        "I", SPA_MEDIA_SUBTYPE_raw,
+                        ":", SPA_FORMAT_mediaType,    "I", SPA_MEDIA_TYPE_video,
+                        ":", SPA_FORMAT_mediaSubtype, "I", SPA_MEDIA_SUBTYPE_raw,
 			":", SPA_FORMAT_VIDEO_format,		"I", &info->format,
 			":", SPA_FORMAT_VIDEO_size,		"R", &info->size,
 			":", SPA_FORMAT_VIDEO_framerate,	"F", &info->framerate);
diff --git a/spa/plugins/alsa/alsa-monitor.c b/spa/plugins/alsa/alsa-monitor.c
index 9fd85917f..8ce1d6a8b 100644
--- a/spa/plugins/alsa/alsa-monitor.c
+++ b/spa/plugins/alsa/alsa-monitor.c
@@ -164,7 +164,7 @@ fill_item(struct impl *this, snd_ctl_card_info_t *card_info,
 		"<", SPA_TYPE_OBJECT_MonitorItem, 0,
 		":", SPA_MONITOR_ITEM_id,      "s", id,
 		":", SPA_MONITOR_ITEM_flags,   "I", SPA_MONITOR_ITEM_FLAG_NONE,
-		":", SPA_MONITOR_ITEM_state,   "I", SPA_MONITOR_ITEM_STATE_AVAILABLE,
+		":", SPA_MONITOR_ITEM_state,   "I", SPA_MONITOR_ITEM_STATE_Available,
 		":", SPA_MONITOR_ITEM_name,    "s", name,
 		":", SPA_MONITOR_ITEM_class,   "s", klass,
 		":", SPA_MONITOR_ITEM_factory, "p", SPA_TYPE_INTERFACE_HandleFactory, factory,
diff --git a/spa/plugins/alsa/alsa-utils.c b/spa/plugins/alsa/alsa-utils.c
index 97558900a..d940d7660 100644
--- a/spa/plugins/alsa/alsa-utils.c
+++ b/spa/plugins/alsa/alsa-utils.c
@@ -135,8 +135,8 @@ spa_alsa_enum_format(struct state *state, uint32_t *index,
 
 	spa_pod_builder_push_object(&b, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
 	spa_pod_builder_add(&b,
-			"I", SPA_MEDIA_TYPE_audio,
-			"I", SPA_MEDIA_SUBTYPE_raw, 0);
+			":", SPA_FORMAT_mediaType,    "I", SPA_MEDIA_TYPE_audio,
+			":", SPA_FORMAT_mediaSubtype, "I", SPA_MEDIA_SUBTYPE_raw, 0);
 
 	snd_pcm_format_mask_alloca(&fmask);
 	snd_pcm_hw_params_get_format_mask(params, fmask);
diff --git a/spa/plugins/audioconvert/channelmix.c b/spa/plugins/audioconvert/channelmix.c
index 504191678..c83009892 100644
--- a/spa/plugins/audioconvert/channelmix.c
+++ b/spa/plugins/audioconvert/channelmix.c
@@ -309,8 +309,8 @@ static int port_enum_formats(struct spa_node *node,
 		if (other->have_format) {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", SPA_AUDIO_FORMAT_F32,
 				":", SPA_FORMAT_AUDIO_layout,   "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
 				":", SPA_FORMAT_AUDIO_rate,     "i", other->format.info.raw.rate,
@@ -319,8 +319,8 @@ static int port_enum_formats(struct spa_node *node,
 		} else {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", SPA_AUDIO_FORMAT_F32,
 				":", SPA_FORMAT_AUDIO_layout,   "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
 				":", SPA_FORMAT_AUDIO_rate,     "iru", DEFAULT_RATE,
@@ -703,7 +703,7 @@ static int process_control(struct impl *this, struct port *port, struct spa_pod_
 
 	SPA_POD_SEQUENCE_FOREACH(sequence, c) {
 		switch (c->type) {
-		case SPA_CONTROL_properties:
+		case SPA_CONTROL_Properties:
 		{
 			struct props *p = &this->props;
 			float volume = p->volume;
diff --git a/spa/plugins/audioconvert/fmtconvert.c b/spa/plugins/audioconvert/fmtconvert.c
index fb4019133..5fe5a6352 100644
--- a/spa/plugins/audioconvert/fmtconvert.c
+++ b/spa/plugins/audioconvert/fmtconvert.c
@@ -422,8 +422,8 @@ static int port_enum_formats(struct spa_node *node,
 		if (other->info.raw.channels > 0) {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "Ieu", other->info.raw.format,
 					SPA_POD_PROP_ENUM(3, other->info.raw.format,
 							     SPA_AUDIO_FORMAT_F32,
@@ -436,8 +436,8 @@ static int port_enum_formats(struct spa_node *node,
 		} else {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "Ieu", SPA_AUDIO_FORMAT_S16,
 					SPA_POD_PROP_ENUM(11, SPA_AUDIO_FORMAT_U8,
 							      SPA_AUDIO_FORMAT_S16,
diff --git a/spa/plugins/audioconvert/merger.c b/spa/plugins/audioconvert/merger.c
index 4f20ad13a..eac378425 100644
--- a/spa/plugins/audioconvert/merger.c
+++ b/spa/plugins/audioconvert/merger.c
@@ -320,8 +320,8 @@ static int port_enum_formats(struct spa_node *node,
 		if (direction == SPA_DIRECTION_OUTPUT) {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "Ieu", SPA_AUDIO_FORMAT_F32,
 					SPA_POD_PROP_ENUM(11,
 							      SPA_AUDIO_FORMAT_F32,
@@ -345,8 +345,8 @@ static int port_enum_formats(struct spa_node *node,
 		else {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", SPA_AUDIO_FORMAT_F32,
 				":", SPA_FORMAT_AUDIO_layout,   "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
 				":", SPA_FORMAT_AUDIO_rate,     rspec, rate,
diff --git a/spa/plugins/audioconvert/resample.c b/spa/plugins/audioconvert/resample.c
index e21644ecb..5c4df94eb 100644
--- a/spa/plugins/audioconvert/resample.c
+++ b/spa/plugins/audioconvert/resample.c
@@ -283,8 +283,8 @@ static int port_enum_formats(struct spa_node *node,
 		if (other->have_format) {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", SPA_AUDIO_FORMAT_F32,
 				":", SPA_FORMAT_AUDIO_layout,   "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
 				":", SPA_FORMAT_AUDIO_rate,     "iru", other->format.info.raw.rate,
@@ -293,8 +293,8 @@ static int port_enum_formats(struct spa_node *node,
 		} else {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", SPA_AUDIO_FORMAT_F32,
 				":", SPA_FORMAT_AUDIO_layout,   "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
 				":", SPA_FORMAT_AUDIO_rate,     "iru", DEFAULT_RATE,
diff --git a/spa/plugins/audioconvert/splitter.c b/spa/plugins/audioconvert/splitter.c
index 4730c602f..b1fec715d 100644
--- a/spa/plugins/audioconvert/splitter.c
+++ b/spa/plugins/audioconvert/splitter.c
@@ -320,8 +320,8 @@ static int port_enum_formats(struct spa_node *node,
 		if (direction == SPA_DIRECTION_INPUT) {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "Ieu", SPA_AUDIO_FORMAT_F32,
 					SPA_POD_PROP_ENUM(11,
 							      SPA_AUDIO_FORMAT_F32,
@@ -345,8 +345,8 @@ static int port_enum_formats(struct spa_node *node,
 		else {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", SPA_AUDIO_FORMAT_F32,
 				":", SPA_FORMAT_AUDIO_layout,   "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
 				":", SPA_FORMAT_AUDIO_rate,     rspec, rate,
diff --git a/spa/plugins/audiomixer/audiomixer.c b/spa/plugins/audiomixer/audiomixer.c
index bcbfd711a..857239adf 100644
--- a/spa/plugins/audiomixer/audiomixer.c
+++ b/spa/plugins/audiomixer/audiomixer.c
@@ -328,16 +328,16 @@ static int port_enum_formats(struct spa_node *node,
 		if (this->have_format) {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", this->format.info.raw.format,
 				":", SPA_FORMAT_AUDIO_rate,     "i", this->format.info.raw.rate,
 				":", SPA_FORMAT_AUDIO_channels, "i", this->format.info.raw.channels);
 		} else {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "Ieu", SPA_AUDIO_FORMAT_S16,
 					SPA_POD_PROP_ENUM(2, SPA_AUDIO_FORMAT_S16,
 							     SPA_AUDIO_FORMAT_F32),
diff --git a/spa/plugins/audiotestsrc/audiotestsrc.c b/spa/plugins/audiotestsrc/audiotestsrc.c
index f59d71922..7062bee24 100644
--- a/spa/plugins/audiotestsrc/audiotestsrc.c
+++ b/spa/plugins/audiotestsrc/audiotestsrc.c
@@ -527,8 +527,8 @@ port_enum_formats(struct impl *this,
 	case 0:
 		*param = spa_pod_builder_object(builder,
 			SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-			"I", SPA_MEDIA_TYPE_audio,
-			"I", SPA_MEDIA_SUBTYPE_raw,
+			":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+			":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 			":", SPA_FORMAT_AUDIO_format,   "Ieu", SPA_AUDIO_FORMAT_S16,
 				SPA_POD_PROP_ENUM(4, SPA_AUDIO_FORMAT_S16,
 						     SPA_AUDIO_FORMAT_S32,
@@ -899,7 +899,7 @@ static int process_control(struct impl *this, struct spa_pod_sequence *sequence)
 
 	SPA_POD_SEQUENCE_FOREACH(sequence, c) {
 		switch (c->type) {
-		case SPA_CONTROL_properties:
+		case SPA_CONTROL_Properties:
 		{
 			struct props *p = &this->props;
 			spa_pod_object_parse(&c->value,
diff --git a/spa/plugins/bluez5/a2dp-sink.c b/spa/plugins/bluez5/a2dp-sink.c
index b0ad5a9d6..140764245 100644
--- a/spa/plugins/bluez5/a2dp-sink.c
+++ b/spa/plugins/bluez5/a2dp-sink.c
@@ -967,8 +967,8 @@ impl_node_port_enum_params(struct spa_node *node,
 
 			param = spa_pod_builder_object(&b,
 				SPA_TYPE_OBJECT_Format, id,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", SPA_AUDIO_FORMAT_S16,
 				":", SPA_FORMAT_AUDIO_layout,   "I", SPA_AUDIO_LAYOUT_INTERLEAVED,
 				":", SPA_FORMAT_AUDIO_rate,     "i", rate,
diff --git a/spa/plugins/bluez5/bluez5-monitor.c b/spa/plugins/bluez5/bluez5-monitor.c
index 0db4dbef5..4bd347764 100644
--- a/spa/plugins/bluez5/bluez5-monitor.c
+++ b/spa/plugins/bluez5/bluez5-monitor.c
@@ -73,7 +73,7 @@ static void fill_item(struct spa_bt_monitor *this, struct spa_bt_transport *tran
 		"<", SPA_TYPE_OBJECT_MonitorItem, 0,
 		":", SPA_MONITOR_ITEM_id,      "s", transport->path,
 		":", SPA_MONITOR_ITEM_flags,   "I", SPA_MONITOR_ITEM_FLAG_NONE,
-		":", SPA_MONITOR_ITEM_state,   "I", SPA_MONITOR_ITEM_STATE_AVAILABLE,
+		":", SPA_MONITOR_ITEM_state,   "I", SPA_MONITOR_ITEM_STATE_Available,
 		":", SPA_MONITOR_ITEM_name,    "s", transport->path,
 		":", SPA_MONITOR_ITEM_class,   "s", "Adapter/Bluetooth",
 		":", SPA_MONITOR_ITEM_factory, "p", SPA_TYPE_INTERFACE_HandleFactory, &spa_a2dp_sink_factory,
diff --git a/spa/plugins/v4l2/v4l2-monitor.c b/spa/plugins/v4l2/v4l2-monitor.c
index 3d38a4cd3..65051ea35 100644
--- a/spa/plugins/v4l2/v4l2-monitor.c
+++ b/spa/plugins/v4l2/v4l2-monitor.c
@@ -101,7 +101,7 @@ static void fill_item(struct impl *this, struct item *item, struct udev_device *
 		"<", SPA_TYPE_OBJECT_MonitorItem, 0,
 		":", SPA_MONITOR_ITEM_id,      "s", udev_device_get_syspath(item->udevice),
 		":", SPA_MONITOR_ITEM_flags,   "I", SPA_MONITOR_ITEM_FLAG_NONE,
-		":", SPA_MONITOR_ITEM_state,   "I", SPA_MONITOR_ITEM_STATE_AVAILABLE,
+		":", SPA_MONITOR_ITEM_state,   "I", SPA_MONITOR_ITEM_STATE_Available,
 		":", SPA_MONITOR_ITEM_name,    "s", name,
 		":", SPA_MONITOR_ITEM_class,   "s", "Video/Source",
 		":", SPA_MONITOR_ITEM_factory, "p", SPA_TYPE_INTERFACE_HandleFactory, &spa_v4l2_source_factory,
diff --git a/spa/plugins/v4l2/v4l2-source.c b/spa/plugins/v4l2/v4l2-source.c
index bfeefe7f4..bd1018fe2 100644
--- a/spa/plugins/v4l2/v4l2-source.c
+++ b/spa/plugins/v4l2/v4l2-source.c
@@ -395,8 +395,8 @@ static int port_get_format(struct spa_node *node,
 	spa_pod_builder_push_object(builder, SPA_TYPE_OBJECT_Format, SPA_PARAM_Format);
 
 	spa_pod_builder_add(builder,
-		"I", port->current_format.media_type,
-		"I", port->current_format.media_subtype, 0);
+		":", SPA_FORMAT_mediaType,    "I", port->current_format.media_type,
+		":", SPA_FORMAT_mediaSubtype, "I", port->current_format.media_subtype, 0);
 
 	switch (port->current_format.media_subtype) {
 	case SPA_MEDIA_SUBTYPE_raw:
diff --git a/spa/plugins/v4l2/v4l2-utils.c b/spa/plugins/v4l2/v4l2-utils.c
index a0cdd4b96..f77accea5 100644
--- a/spa/plugins/v4l2/v4l2-utils.c
+++ b/spa/plugins/v4l2/v4l2-utils.c
@@ -676,8 +676,8 @@ spa_v4l2_enum_format(struct impl *this,
 
 	spa_pod_builder_push_object(builder, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
 	spa_pod_builder_add(builder,
-			"I", info->media_type,
-			"I", info->media_subtype, 0);
+			":", SPA_FORMAT_mediaType, "I", info->media_type,
+			":", SPA_FORMAT_mediaSubtype, "I", info->media_subtype, 0);
 
 	if (info->media_subtype == SPA_MEDIA_SUBTYPE_raw) {
 		spa_pod_builder_add(builder,
diff --git a/spa/plugins/videotestsrc/videotestsrc.c b/spa/plugins/videotestsrc/videotestsrc.c
index 97f89298b..aeabc05c3 100644
--- a/spa/plugins/videotestsrc/videotestsrc.c
+++ b/spa/plugins/videotestsrc/videotestsrc.c
@@ -464,8 +464,8 @@ static int port_enum_formats(struct spa_node *node,
 	case 0:
 		*param = spa_pod_builder_object(builder,
 			SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-			"I", SPA_MEDIA_TYPE_video,
-			"I", SPA_MEDIA_SUBTYPE_raw,
+			":", SPA_FORMAT_mediaType,       "I", SPA_MEDIA_TYPE_video,
+			":", SPA_FORMAT_mediaSubtype,    "I", SPA_MEDIA_SUBTYPE_raw,
 			":", SPA_FORMAT_VIDEO_format,    "Ieu", SPA_VIDEO_FORMAT_RGB,
 				SPA_POD_PROP_ENUM(2, SPA_VIDEO_FORMAT_RGB,
 						     SPA_VIDEO_FORMAT_UYVY),
diff --git a/spa/plugins/volume/volume.c b/spa/plugins/volume/volume.c
index 9b308a355..535c4bb95 100644
--- a/spa/plugins/volume/volume.c
+++ b/spa/plugins/volume/volume.c
@@ -328,8 +328,8 @@ static int port_enum_formats(struct spa_node *node,
 	case 0:
 		*param = spa_pod_builder_object(builder,
 			SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-			"I", SPA_MEDIA_TYPE_audio,
-			"I", SPA_MEDIA_SUBTYPE_raw,
+			":", SPA_FORMAT_mediaType,     "I", SPA_MEDIA_TYPE_audio,
+			":", SPA_FORMAT_mediaSubtype,  "I", SPA_MEDIA_SUBTYPE_raw,
 			":", SPA_FORMAT_AUDIO_format,  "Ieu", SPA_AUDIO_FORMAT_S16,
 				SPA_POD_PROP_ENUM(2, SPA_AUDIO_FORMAT_S16,
 						     SPA_AUDIO_FORMAT_S32),
diff --git a/spa/tests/test-control.c b/spa/tests/test-control.c
index 3ce502c1c..e96aeec11 100644
--- a/spa/tests/test-control.c
+++ b/spa/tests/test-control.c
@@ -201,7 +201,7 @@ static void update_props(struct data *data)
 
 #if 1
 	pod = spa_pod_builder_sequence(&b, 0,
-	".", 0, SPA_CONTROL_properties,
+	".", 0, SPA_CONTROL_Properties,
 		SPA_POD_OBJECT(SPA_TYPE_OBJECT_Props, 0,
 		":", SPA_PROP_frequency, "d", ((sin(data->freq_accum) + 1.0) * 200.0) + 440.0,
 		":", SPA_PROP_volume,    "d", (sin(data->volume_accum) / 2.0) + 0.5));
diff --git a/spa/tests/test-perf.c b/spa/tests/test-perf.c
index 0ea561753..debf97d9c 100644
--- a/spa/tests/test-perf.c
+++ b/spa/tests/test-perf.c
@@ -360,8 +360,8 @@ static int negotiate_formats(struct data *data)
 	spa_pod_builder_init(&b, buffer, sizeof(buffer));
 	format = spa_pod_builder_object(&b,
 			SPA_TYPE_OBJECT_Format, 0,
-			"I", SPA_MEDIA_TYPE_binary,
-			"I", SPA_MEDIA_SUBTYPE_raw);
+			":", SPA_FORMAT_mediaType,     "I", SPA_MEDIA_TYPE_binary,
+			":", SPA_FORMAT_mediaSubtype,  "I", SPA_MEDIA_SUBTYPE_raw);
 
 	if ((res = spa_node_port_set_param(data->sink,
 					   SPA_DIRECTION_INPUT, 0,
diff --git a/spa/tests/test-props.c b/spa/tests/test-props.c
index cc1f54f68..72435563a 100644
--- a/spa/tests/test-props.c
+++ b/spa/tests/test-props.c
@@ -300,8 +300,8 @@ int main(int argc, char *argv[])
 
 	fmt = spa_pod_builder_object(&b,
 		SPA_TYPE_OBJECT_Format, 0,
-		"I", SPA_MEDIA_TYPE_video,
-		"I", SPA_MEDIA_SUBTYPE_raw,
+		":", SPA_FORMAT_mediaType,       "I", SPA_MEDIA_TYPE_video,
+		":", SPA_FORMAT_mediaSubtype,    "I", SPA_MEDIA_SUBTYPE_raw,
 		":", SPA_FORMAT_VIDEO_format,    "Ieu", SPA_VIDEO_FORMAT_I420,
 								2, SPA_VIDEO_FORMAT_I420,
 								   SPA_VIDEO_FORMAT_YUY2,
@@ -329,8 +329,8 @@ int main(int argc, char *argv[])
 	 */
 	fmt = spa_pod_builder_add(&b,
 		"<", SPA_TYPE_OBJECT_Format, 0,
-		"I", SPA_MEDIA_TYPE_video,
-		"I", SPA_MEDIA_SUBTYPE_raw,
+		":", SPA_FORMAT_mediaType,       "I", SPA_MEDIA_TYPE_video,
+		":", SPA_FORMAT_mediaSubtype,    "I", SPA_MEDIA_SUBTYPE_raw,
 		":", SPA_FORMAT_VIDEO_format,    "Ieu", SPA_VIDEO_FORMAT_I420,
 								2, SPA_VIDEO_FORMAT_I420,
 								   SPA_VIDEO_FORMAT_YUY2,
@@ -348,9 +348,9 @@ int main(int argc, char *argv[])
 	do_static_struct();
 
 #if 0
-	printf("media type is enum %d\n", spa_type_is_a(SPA_TYPE__MediaType, SPA_TYPE_ENUM_BASE));
+	printf("media type is enum %d\n", spa_type_is_a(SPA_TYPE__mediaType, SPA_TYPE_ENUM_BASE));
 	printf("media sybtype is enum %d\n",
-	       spa_type_is_a(SPA_TYPE__MediaSubtype, SPA_TYPE_ENUM_BASE));
+	       spa_type_is_a(SPA_TYPE__mediaSubtype, SPA_TYPE_ENUM_BASE));
 	printf("format is enum %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_ENUM_BASE));
 	printf("format is pod %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_POD_BASE));
 	printf("format is object %d\n", spa_type_is_a(SPA_TYPE__Format, SPA_TYPE_POD_OBJECT_BASE));
diff --git a/src/examples/export-source.c b/src/examples/export-source.c
index 564f4285e..2f11523f6 100644
--- a/src/examples/export-source.c
+++ b/src/examples/export-source.c
@@ -182,8 +182,8 @@ static int port_enum_formats(struct spa_node *node,
 
 	*param = spa_pod_builder_object(builder,
 		SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-		"I", SPA_MEDIA_TYPE_audio,
-		"I", SPA_MEDIA_SUBTYPE_raw,
+		":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+		":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 		":", SPA_FORMAT_AUDIO_format,   "Ieu", SPA_AUDIO_FORMAT_S16,
 			SPA_POD_PROP_ENUM(2, SPA_AUDIO_FORMAT_S16,
 					     SPA_AUDIO_FORMAT_F32),
diff --git a/src/examples/local-v4l2.c b/src/examples/local-v4l2.c
index b932b31ef..435baf31b 100644
--- a/src/examples/local-v4l2.c
+++ b/src/examples/local-v4l2.c
@@ -226,8 +226,13 @@ static int port_enum_formats(struct spa_node *node,
 	SDL_GetRendererInfo(d->renderer, &info);
 
 	spa_pod_builder_push_object(builder, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
+	spa_pod_builder_push_prop(builder, SPA_FORMAT_mediaType, 0);
 	spa_pod_builder_enum(builder, SPA_MEDIA_TYPE_video);
+	spa_pod_builder_pop(builder);
+
+	spa_pod_builder_push_prop(builder, SPA_FORMAT_mediaSubtype, 0);
 	spa_pod_builder_enum(builder, SPA_MEDIA_SUBTYPE_raw);
+	spa_pod_builder_pop(builder);
 
 	spa_pod_builder_push_prop(builder, SPA_FORMAT_VIDEO_format,
 				  SPA_POD_PROP_FLAG_UNSET |
diff --git a/src/examples/sdl.h b/src/examples/sdl.h
index 1f6e816aa..60aed590e 100644
--- a/src/examples/sdl.h
+++ b/src/examples/sdl.h
@@ -98,8 +98,12 @@ static struct spa_pod *sdl_build_formats(SDL_RendererInfo *info, struct spa_pod_
 	int i, c;
 
 	spa_pod_builder_push_object(b, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
+	spa_pod_builder_push_prop(b, SPA_FORMAT_mediaType, 0);
 	spa_pod_builder_enum(b, SPA_MEDIA_TYPE_video);
+	spa_pod_builder_pop(b);
+	spa_pod_builder_push_prop(b, SPA_FORMAT_mediaSubtype, 0);
 	spa_pod_builder_enum(b, SPA_MEDIA_SUBTYPE_raw);
+	spa_pod_builder_pop(b);
 
 	spa_pod_builder_push_prop(b, SPA_FORMAT_VIDEO_format,
 				  SPA_POD_PROP_FLAG_UNSET |
diff --git a/src/examples/video-src.c b/src/examples/video-src.c
index 82e643e4d..331d2cf08 100644
--- a/src/examples/video-src.c
+++ b/src/examples/video-src.c
@@ -224,8 +224,8 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
 
 		params[0] = spa_pod_builder_object(&b,
 			SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-			"I", SPA_MEDIA_TYPE_video,
-			"I", SPA_MEDIA_SUBTYPE_raw,
+			":", SPA_FORMAT_mediaType,       "I", SPA_MEDIA_TYPE_video,
+			":", SPA_FORMAT_mediaSubtype,    "I", SPA_MEDIA_SUBTYPE_raw,
 			":", SPA_FORMAT_VIDEO_format,    "I", SPA_VIDEO_FORMAT_RGB,
 			":", SPA_FORMAT_VIDEO_size,      "Rru", &SPA_RECTANGLE(320, 240),
 				SPA_POD_PROP_MIN_MAX(&SPA_RECTANGLE(1, 1),
diff --git a/src/gst/gstpipewireformat.c b/src/gst/gstpipewireformat.c
index ab0b50943..e2b8c3760 100644
--- a/src/gst/gstpipewireformat.c
+++ b/src/gst/gstpipewireformat.c
@@ -535,8 +535,14 @@ convert_1 (ConvertData *d)
   d->b.write = write_pod;
 
   spa_pod_builder_push_object (&d->b, SPA_TYPE_OBJECT_Format, d->id);
+
+  spa_pod_builder_push_prop (&d->b, SPA_FORMAT_mediaType, 0);
   spa_pod_builder_enum(&d->b, d->type->media_type);
+  spa_pod_builder_pop (&d->b);
+
+  spa_pod_builder_push_prop (&d->b, SPA_FORMAT_mediaSubtype, 0);
   spa_pod_builder_enum(&d->b, d->type->media_subtype);
+  spa_pod_builder_pop (&d->b);
 
   if (d->type->media_type == SPA_MEDIA_TYPE_video)
     handle_video_fields (d);
diff --git a/src/modules/module-media-session/floatmix.c b/src/modules/module-media-session/floatmix.c
index bf9062576..9949a2c1e 100644
--- a/src/modules/module-media-session/floatmix.c
+++ b/src/modules/module-media-session/floatmix.c
@@ -329,8 +329,8 @@ static int port_enum_formats(struct spa_node *node,
 		} else {
 			*param = spa_pod_builder_object(builder,
 				SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
-				"I", SPA_MEDIA_TYPE_audio,
-				"I", SPA_MEDIA_SUBTYPE_raw,
+				":", SPA_FORMAT_mediaType,      "I", SPA_MEDIA_TYPE_audio,
+				":", SPA_FORMAT_mediaSubtype,   "I", SPA_MEDIA_SUBTYPE_raw,
 				":", SPA_FORMAT_AUDIO_format,   "I", SPA_AUDIO_FORMAT_F32,
 				":", SPA_FORMAT_AUDIO_layout,   "I", SPA_AUDIO_LAYOUT_NON_INTERLEAVED,
 				":", SPA_FORMAT_AUDIO_rate,     "iru", 44100,
diff --git a/src/modules/spa/spa-monitor.c b/src/modules/spa/spa-monitor.c
index 173f5f04c..73a75826f 100644
--- a/src/modules/spa/spa-monitor.c
+++ b/src/modules/spa/spa-monitor.c
@@ -124,7 +124,7 @@ static struct monitor_item *add_item(struct pw_spa_monitor *this,
 	}
 
 	flags = PW_SPA_NODE_FLAG_ACTIVATE;
-	flags |= (state == SPA_MONITOR_ITEM_STATE_AVAILABLE) ? 0 : PW_SPA_NODE_FLAG_DISABLE;
+	flags |= (state == SPA_MONITOR_ITEM_STATE_Available) ? 0 : PW_SPA_NODE_FLAG_DISABLE;
 
 	mitem = calloc(1, sizeof(struct monitor_item));
 	mitem->id = strdup(id);
@@ -197,13 +197,15 @@ static void change_item(struct pw_spa_monitor *this, struct spa_pod *item, uint6
 		return;
 
 	switch (state) {
-	case SPA_MONITOR_ITEM_STATE_AVAILABLE:
+	case SPA_MONITOR_ITEM_STATE_Available:
 		pw_node_set_enabled(mitem->node, true);
 		break;
-	case SPA_MONITOR_ITEM_STATE_DISABLED:
-	case SPA_MONITOR_ITEM_STATE_UNAVAILABLE:
+	case SPA_MONITOR_ITEM_STATE_Disabled:
+	case SPA_MONITOR_ITEM_STATE_Unavailable:
 		pw_node_set_enabled(mitem->node, false);
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/src/tools/pipewire-monitor.c b/src/tools/pipewire-monitor.c
index 33f6a6ea7..91f9bf07a 100644
--- a/src/tools/pipewire-monitor.c
+++ b/src/tools/pipewire-monitor.c
@@ -218,9 +218,9 @@ static void print_node(struct proxy_data *data)
 		printf("%c\tparams:\n", MARK_CHANGE(5));
 		for (i = 0; i < data->n_params; i++) {
 			if (spa_pod_is_object_type(data->params[i], SPA_TYPE_OBJECT_Format))
-				spa_debug_format(2, NULL, data->params[i]);
+				spa_debug_format(10, NULL, data->params[i]);
 			else
-				spa_debug_pod(2, spa_debug_types, data->params[i]);
+				spa_debug_pod(10, spa_debug_types, data->params[i]);
 		}
 		printf("%c\tinput ports: %u/%u\n", MARK_CHANGE(1),
 				info->n_input_ports, info->max_input_ports);
@@ -293,9 +293,9 @@ static void print_port(struct proxy_data *data)
 		printf("%c\tparams:\n", MARK_CHANGE(2));
 		for (i = 0; i < data->n_params; i++) {
 			if (spa_pod_is_object_type(data->params[i], SPA_TYPE_OBJECT_Format))
-				spa_debug_format(2, NULL, data->params[i]);
+				spa_debug_format(12, NULL, data->params[i]);
 			else
-				spa_debug_pod(2, spa_debug_types, data->params[i]);
+				spa_debug_pod(12, spa_debug_types, data->params[i]);
 		}
 		print_properties(info->props, MARK_CHANGE(1));
 	}