Include core ID as part of thread ID
Make terminology consistent strand->thread