update templates

Change-Id: If1dd3a861900a3322d8a4ed9c1c8f5a427d36e58
diff --git a/lib/encoding_cpp.template b/lib/encoding_cpp.template
index 258feab..a537614 100644
--- a/lib/encoding_cpp.template
+++ b/lib/encoding_cpp.template
@@ -310,7 +310,7 @@
         utf8.push_back((latin1[ii] | 0x80) & 0xbf);
       }
     }
-    EncodeString8(SpanFromVector(utf8), out);
+    EncodeString8(SpanFrom(utf8), out);
     return;
   }
   EncodeString8(latin1, out);
diff --git a/lib/encoding_h.template b/lib/encoding_h.template
index bc10ed8..8f62c9e 100644
--- a/lib/encoding_h.template
+++ b/lib/encoding_h.template
@@ -62,11 +62,11 @@
 };
 
 template <typename T>
-span<T> SpanFromVector(const std::vector<T>& v) {
+span<T> SpanFrom(const std::vector<T>& v) {
   return span<T>(v.data(), v.size());
 }
 
-inline span<uint8_t> SpanFromStdString(const std::string& v) {
+inline span<uint8_t> SpanFrom(const std::string& v) {
   return span<uint8_t>(reinterpret_cast<const uint8_t*>(v.data()), v.size());
 }