diff --git a/client/container_space.go b/client/container_space.go
index af984e5..c066c0a 100644
--- a/client/container_space.go
+++ b/client/container_space.go
@@ -14,27 +14,29 @@ import (
 
 // PrmAnnounceSpace groups parameters of ContainerAnnounceUsedSpace operation.
 type PrmAnnounceSpace struct {
-	prmCommonMeta
+	XHeaders []string
 
-	announcements []container.SizeEstimation
+	Announcements []container.SizeEstimation
 }
 
 // SetValues sets values describing volume of space that is used for the container objects.
 // Required parameter. Must not be empty.
 //
 // Must not be mutated before the end of the operation.
+//
+// Deprecated: Use PrmAnnounceSpace.Announcements instead.
 func (x *PrmAnnounceSpace) SetValues(vs []container.SizeEstimation) {
-	x.announcements = vs
+	x.Announcements = vs
 }
 
 func (x *PrmAnnounceSpace) buildRequest(c *Client) (*v2container.AnnounceUsedSpaceRequest, error) {
-	if len(x.announcements) == 0 {
+	if len(x.Announcements) == 0 {
 		return nil, errorMissingAnnouncements
 	}
 
-	v2announce := make([]v2container.UsedSpaceAnnouncement, len(x.announcements))
-	for i := range x.announcements {
-		x.announcements[i].WriteToV2(&v2announce[i])
+	v2announce := make([]v2container.UsedSpaceAnnouncement, len(x.Announcements))
+	for i := range x.Announcements {
+		x.Announcements[i].WriteToV2(&v2announce[i])
 	}
 
 	reqBody := new(v2container.AnnounceUsedSpaceRequestBody)
diff --git a/client/netmap.go b/client/netmap.go
index b63ba65..80d1ded 100644
--- a/client/netmap.go
+++ b/client/netmap.go
@@ -16,12 +16,12 @@ import (
 
 // PrmEndpointInfo groups parameters of EndpointInfo operation.
 type PrmEndpointInfo struct {
-	prmCommonMeta
+	XHeaders []string
 }
 
 func (x *PrmEndpointInfo) buildRequest(c *Client) (*v2netmap.LocalNodeInfoRequest, error) {
 	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(x.xHeaders, meta)
+	writeXHeadersToMeta(x.XHeaders, meta)
 
 	req := new(v2netmap.LocalNodeInfoRequest)
 	req.SetBody(new(v2netmap.LocalNodeInfoRequestBody))
@@ -112,12 +112,12 @@ func (c *Client) EndpointInfo(ctx context.Context, prm PrmEndpointInfo) (*ResEnd
 
 // PrmNetworkInfo groups parameters of NetworkInfo operation.
 type PrmNetworkInfo struct {
-	prmCommonMeta
+	XHeaders []string
 }
 
 func (x PrmNetworkInfo) buildRequest(c *Client) (*v2netmap.NetworkInfoRequest, error) {
 	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(x.xHeaders, meta)
+	writeXHeadersToMeta(x.XHeaders, meta)
 
 	var req v2netmap.NetworkInfoRequest
 	req.SetBody(new(v2netmap.NetworkInfoRequestBody))