More OpenStudioCore->OSCore changes