renamed entries more properly