Agreed. I'll do just that. Those names do work far better too.