refactor names to all cores