Does 'focal length' mean something different with lenses and pinhole cameras?
Focal length in Physics is a property of a lens usually labeled $f$. It doesn't depend on the distances to the object or image involved (though you may determine if from that information).
The distance from the lens to the image is the image distance, often labeled $q$ or $d_i$. If it's positive, there is a real image and that is where the film or sensor should be.
A pinhole camera doesn't have a lens. It has a focal length of $\infty$. This leads to a virtual image (negative $q$), but the pinhole gives it such a huge depth of field that you call place the film anywhere and get focus as if you had a real image.
While your sketch is correct, its scales may confuse you in this case. Do remember that, denoting the distances from the lens to the object and image plane by $z_o$ and $z_i$, respectively, we have $$\frac 1f = \frac{1}{z_o} + \frac{1}{z_i}.$$
Now in real world scenes, usually the camera dimensions are very small, so that $$z_o \gg z_i \Rightarrow f \approx z_i.$$
This means that a lensed camera with "focal point" at a distance $f$ from the lens can be geometrically thought of as a pinhole camera with "focal length" $f$. Of course the main difference is that since the lens in fact focuses many rays from the object to the same point on the image plane, the resulting intensity will be much higher. This approximation is very useful, however, when you try to figure the directions distances towards photographed objects.