Pushing responsibility for forming volatility surface names  down to classes that deal with individual instrument types
Checking for non-empty properties
Adding INR deposit conventions