Add dynamic class names for better debugging

Adding ability to dynamically name the Surrogate to allow for better debugging.