Use more consistent naming for tabs
Be more expressive about data source refreshing code