moving away from underscore to individual components