Clearer naming and information.