Renamed some stuff and a horologist villager! :))