Cleanup some naming issues and addressable cores