Missed some name fixes. Should be all good now.