Rename primary and secondary to core and external