Update with better naming