Make naming more informative, and make predictions have more info