Rename Core NS into Bus