Update more OpenStudioCore to OSCore