Don't remove "_off" tail from surface names