Yes, better names is a good idea.