Use much better naming scheme for smart updates.