Update properties' names after shortening includes