Renamed system keys in entity to lead with underscore