diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c
index 2998970..f52c38a 100644
--- a/src/libFLAC/format.c
+++ b/src/libFLAC/format.c
@@ -234,17 +234,16 @@
 	return max_rice_partition_order;
 }
 
-void FLAC__format_entropy_coding_method_partitioned_rice_init(FLAC__EntropyCodingMethod_PartitionedRice *object)
+void FLAC__format_entropy_coding_method_partitioned_rice_contents_init(FLAC__EntropyCodingMethod_PartitionedRiceContents *object)
 {
 	FLAC__ASSERT(0 != object);
 
-	object->order = 0;
 	object->parameters = 0;
 	object->raw_bits = 0;
 	object->capacity_by_order = 0;
 }
 
-void FLAC__format_entropy_coding_method_partitioned_rice_clear(FLAC__EntropyCodingMethod_PartitionedRice *object)
+void FLAC__format_entropy_coding_method_partitioned_rice_contents_clear(FLAC__EntropyCodingMethod_PartitionedRiceContents *object)
 {
 	FLAC__ASSERT(0 != object);
 
@@ -252,10 +251,10 @@
 		free(object->parameters);
 	if(0 != object->raw_bits)
 		free(object->raw_bits);
-	FLAC__format_entropy_coding_method_partitioned_rice_init(object);
+	FLAC__format_entropy_coding_method_partitioned_rice_contents_init(object);
 }
 
-FLAC__bool FLAC__format_entropy_coding_method_partitioned_rice_ensure_size(FLAC__EntropyCodingMethod_PartitionedRice *object, unsigned max_partition_order)
+FLAC__bool FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_size(FLAC__EntropyCodingMethod_PartitionedRiceContents *object, unsigned max_partition_order)
 {
 	FLAC__ASSERT(0 != object);