Renamed partials because of redundant naming