Fixed All Bugs in Surface Names

Now, no matter what the names of the surfaces are, the component will
work.  It will not bring in surfaces if the zone name is not included in
the surface name.