Use more consistent naming.