diff --git a/src/mako/lib.rs.mako b/src/mako/lib.rs.mako
index 2e51442d926..21866a6fa5e 100644
--- a/src/mako/lib.rs.mako
+++ b/src/mako/lib.rs.mako
@@ -52,7 +52,7 @@ use std::io;
 use std::fs;
 use std::thread::sleep;
 
-pub use cmn::{MultiPartReader, ToParts, MethodInfo, Result, CallBuilder, Hub, ReadSeek, Part, ResponseResult, RequestValue, NestedType, Delegate, DefaultDelegate, ResourceMethodsBuilder, Resource, JsonServerError};
+pub use cmn::{MultiPartReader, ToParts, MethodInfo, Result, CallBuilder, Hub, ReadSeek, Part, ResponseResult, RequestValue, NestedType, Delegate, DefaultDelegate, MethodsBuilder, Resource, JsonServerError};
 
 
 // ##############
diff --git a/src/mako/lib/mbuild.mako b/src/mako/lib/mbuild.mako
index eb16a1a94c4..9d0926b3706 100644
--- a/src/mako/lib/mbuild.mako
+++ b/src/mako/lib/mbuild.mako
@@ -744,9 +744,9 @@ else {
 
                 dlg.pre_request();
                 req.send()
-</%block>
+</%block>\
                 % if resumable_media_param:
-                }
+            }
                 % endif
             };
 
diff --git a/src/mako/lib/rbuild.mako b/src/mako/lib/rbuild.mako
index 4cbaab0b5f4..c1cd60aca99 100644
--- a/src/mako/lib/rbuild.mako
+++ b/src/mako/lib/rbuild.mako
@@ -48,7 +48,7 @@ pub struct ${ThisType}
     hub: &'a ${hub_type_name}${hub_type_params_s()},
 }
 
-impl${rb_params} ResourceMethodsBuilder for ${ThisType} {}
+impl${rb_params} MethodsBuilder for ${ThisType} {}
 
 ## Builder Creators Methods ####################
 impl${rb_params} ${ThisType} {
diff --git a/src/rust/cmn.rs b/src/rust/cmn.rs
index 91c80a846f8..db9fd299493 100644
--- a/src/rust/cmn.rs
+++ b/src/rust/cmn.rs
@@ -22,7 +22,7 @@ use serde;
 pub trait Hub: MarkerTrait {}
 
 /// Identifies types for building methods of a particular resource type
-pub trait ResourceMethodsBuilder: MarkerTrait {}
+pub trait MethodsBuilder: MarkerTrait {}
 
 /// Identifies types which represent builders for a particular resource method
 pub trait CallBuilder: MarkerTrait {}