Adopt STL naming convention in Origin.hh