Rename packages (#153)

samples/SkiaJvmSample/src/main/kotlin/SkijaInjectSample/App.kt

@@ -2,11 +2,11 @@ package SkijaInjectSample
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.swing.Swing
-import org.jetbrains.skija.*
-import org.jetbrains.skija.paragraph.FontCollection
-import org.jetbrains.skija.paragraph.ParagraphBuilder
-import org.jetbrains.skija.paragraph.ParagraphStyle
-import org.jetbrains.skija.paragraph.TextStyle
+import org.jetbrains.skia.*
+import org.jetbrains.skia.paragraph.FontCollection
+import org.jetbrains.skia.paragraph.ParagraphBuilder
+import org.jetbrains.skia.paragraph.ParagraphStyle
+import org.jetbrains.skia.paragraph.TextStyle
 import org.jetbrains.skiko.*
 import java.awt.Dimension
 import java.awt.Toolkit

skiko/src/commonMain/kotlin/org/jetbrains/skija/AnimationDisposalMethod.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/AnimationDisposalMethod.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  *

skiko/src/commonMain/kotlin/org/jetbrains/skija/AnimationDisposalMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/AnimationDisposalMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  *

skiko/src/commonMain/kotlin/org/jetbrains/skija/BlendMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/BlendMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class BlendMode {
     /** Replaces destination with zero: fully transparent.  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/ClipMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/ClipMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class ClipMode {
     DIFFERENCE, INTERSECT;

skiko/src/commonMain/kotlin/org/jetbrains/skija/Color.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/Color.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 object Color {
     // TODO premultiply, alpha

skiko/src/commonMain/kotlin/org/jetbrains/skija/Color4f.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/Color4f.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 import kotlin.math.round
 

skiko/src/commonMain/kotlin/org/jetbrains/skija/ColorAlphaType.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/ColorAlphaType.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  *

skiko/src/commonMain/kotlin/org/jetbrains/skija/ColorChannel.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/ColorChannel.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class ColorChannel {
     R, G, B, A;

skiko/src/commonMain/kotlin/org/jetbrains/skija/ColorType.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/ColorType.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  * Describes how pixel bits encode color. A pixel may be an alpha mask, a

skiko/src/commonMain/kotlin/org/jetbrains/skija/ContentChangeMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/ContentChangeMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class ContentChangeMode {
     /** Discards surface on change.  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/CubicResampler.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/CubicResampler.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  *

skiko/src/commonMain/kotlin/org/jetbrains/skija/EncodedImageFormat.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/EncodedImageFormat.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class EncodedImageFormat {
     BMP, GIF, ICO, JPEG, PNG, WBMP, WEBP, PKM, KTX, ASTC, DNG, HEIF;

skiko/src/commonMain/kotlin/org/jetbrains/skija/EncodedOrigin.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/EncodedOrigin.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class EncodedOrigin {
     _UNUSED,

skiko/src/commonMain/kotlin/org/jetbrains/skija/FilterBlurMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FilterBlurMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class FilterBlurMode {
     /** fuzzy inside and outside  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/FilterMipmap.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FilterMipmap.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 class FilterMipmap constructor(
     internal val filterMode: FilterMode,

skiko/src/commonMain/kotlin/org/jetbrains/skija/FilterMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FilterMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class FilterMode {
     /**

skiko/src/commonMain/kotlin/org/jetbrains/skija/FilterQuality.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FilterQuality.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class FilterQuality {
     /** fastest but lowest quality, typically nearest-neighbor  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/FilterTileMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FilterTileMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class FilterTileMode {
     /** Replicate the edge color if the shader draws outside of its original bounds.  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/FontEdging.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FontEdging.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  * Whether edge pixels draw opaque or with partial transparency.

skiko/src/commonMain/kotlin/org/jetbrains/skija/FontHinting.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FontHinting.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  * Level of glyph outline adjustment

skiko/src/commonMain/kotlin/org/jetbrains/skija/FontSlant.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FontSlant.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class FontSlant {
     UPRIGHT, ITALIC, OBLIQUE;

skiko/src/commonMain/kotlin/org/jetbrains/skija/FontWeight.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FontWeight.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 interface FontWeight {
     companion object {

skiko/src/commonMain/kotlin/org/jetbrains/skija/FontWidth.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FontWidth.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 interface FontWidth {
     companion object {

skiko/src/commonMain/kotlin/org/jetbrains/skija/FourByteTag.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FourByteTag.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 interface FourByteTag {
     companion object {

skiko/src/commonMain/kotlin/org/jetbrains/skija/FramebufferFormat.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/FramebufferFormat.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 interface FramebufferFormat {
     companion object {

skiko/src/commonMain/kotlin/org/jetbrains/skija/IPoint.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/IPoint.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 class IPoint(val x: Int, val y: Int) {
 

skiko/src/commonMain/kotlin/org/jetbrains/skija/IRange.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/IRange.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 
 class IRange(internal val start: Int, internal val end: Int) {

skiko/src/commonMain/kotlin/org/jetbrains/skija/InversionMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/InversionMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class InversionMode {
     NO, BRIGHTNESS, LIGHTNESS;

skiko/src/commonMain/kotlin/org/jetbrains/skija/Matrix33.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/Matrix33.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 import kotlin.math.PI
 import kotlin.math.abs

skiko/src/commonMain/kotlin/org/jetbrains/skija/Matrix44.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/Matrix44.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  *

skiko/src/commonMain/kotlin/org/jetbrains/skija/MipmapMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/MipmapMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 
 enum class MipmapMode {

skiko/src/commonMain/kotlin/org/jetbrains/skija/PaintMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PaintMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class PaintMode {
     FILL, STROKE, STROKE_AND_FILL;

skiko/src/commonMain/kotlin/org/jetbrains/skija/PaintStrokeCap.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PaintStrokeCap.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  * Cap draws at the beginning and end of an open path contour.

skiko/src/commonMain/kotlin/org/jetbrains/skija/PaintStrokeJoin.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PaintStrokeJoin.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  *

skiko/src/commonMain/kotlin/org/jetbrains/skija/PathDirection.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PathDirection.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class PathDirection {
     /** Clockwise direction for adding closed contours.  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/PathEllipseArc.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PathEllipseArc.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 
 enum class PathEllipseArc {

skiko/src/commonMain/kotlin/org/jetbrains/skija/PathFillMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PathFillMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class PathFillMode {
     /** Specifies that "inside" is computed by a non-zero sum of signed edge crossings.  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/PathOp.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PathOp.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
  * The logical operations that can be performed when combining two paths.

skiko/src/commonMain/kotlin/org/jetbrains/skija/PathSegmentMask.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PathSegmentMask.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 interface PathSegmentMask {
     companion object {

skiko/src/commonMain/kotlin/org/jetbrains/skija/PixelGeometry.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/PixelGeometry.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class PixelGeometry {
     UNKNOWN, RGB_H, BGR_H, RGB_V, BGR_V;

skiko/src/commonMain/kotlin/org/jetbrains/skija/Point.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/Point.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 class Point(val x: Float, val y: Float) {
 

skiko/src/commonMain/kotlin/org/jetbrains/skija/Point3.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/Point3.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 class Point3(val x: Float, val y: Float, val z: Float) {
     override fun equals(o: Any?): Boolean {

skiko/src/commonMain/kotlin/org/jetbrains/skija/SamplingMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/SamplingMode.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 /**
- * @see org.jetbrains.skija.FilterMipmap
+ * @see org.jetbrains.skia.FilterMipmap
  *
- * @see org.jetbrains.skija.CubicResampler
+ * @see org.jetbrains.skia.CubicResampler
  */
 interface SamplingMode {
     fun _pack(): Long

skiko/src/commonMain/kotlin/org/jetbrains/skija/SurfaceColorFormat.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/SurfaceColorFormat.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class SurfaceColorFormat {
     UNKNOWN,  //!< uninitialized

skiko/src/commonMain/kotlin/org/jetbrains/skija/SurfaceOrigin.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/SurfaceOrigin.kt

-package org.jetbrains.skija
+package org.jetbrains.skia
 
 enum class SurfaceOrigin {
     TOP_LEFT, BOTTOM_LEFT;

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/Affinity.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Affinity.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class Affinity {
     UPSTREAM, DOWNSTREAM;

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/Alignment.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Alignment.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class Alignment {
     LEFT, RIGHT, CENTER, JUSTIFY, START, END;

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/BaselineMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/BaselineMode.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class BaselineMode {
     ALPHABETIC, IDEOGRAPHIC;

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/DecorationLineStyle.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/DecorationLineStyle.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class DecorationLineStyle {
     SOLID, DOUBLE, DOTTED, DASHED, WAVY;

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/Direction.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Direction.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class Direction {
     RTL, LTR;

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/HeightMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/HeightMode.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class HeightMode {
     ALL, DISABLE_FIRST_ASCENT, DISABLE_LAST_DESCENT, DISABLE_ALL;

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/PlaceholderAlignment.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/PlaceholderAlignment.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 /**
  * Where to vertically align the placeholder relative to the surrounding text.

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/RectHeightMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/RectHeightMode.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class RectHeightMode {
     /** Provide tight bounding boxes that fit heights per run.  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/RectWidthMode.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/RectWidthMode.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class RectWidthMode {
     /** Provide tight bounding boxes that fit widths to the runs of each line independently.  */

skiko/src/commonMain/kotlin/org/jetbrains/skija/paragraph/TextStyleAttribute.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/TextStyleAttribute.kt

-package org.jetbrains.skija.paragraph
+package org.jetbrains.skia.paragraph
 
 enum class TextStyleAttribute {
     NONE, ALL_ATTRIBUTES, FONT, FOREGROUND, BACKGROUND, SHADOW, DECORATIONS, LETTER_SPACING, WORD_SPACING, FONT_EXACT;

skiko/src/commonMain/kotlin/org/jetbrains/skija/svg/SVGLengthType.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/svg/SVGLengthType.kt

-package org.jetbrains.skija.svg
+package org.jetbrains.skia.svg
 
 enum class SVGLengthType {
     HORIZONTAL, VERTICAL, OTHER;

skiko/src/commonMain/kotlin/org/jetbrains/skija/svg/SVGLengthUnit.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/svg/SVGLengthUnit.kt

-package org.jetbrains.skija.svg
+package org.jetbrains.skia.svg
 
 enum class SVGLengthUnit {
     UNKNOWN, NUMBER, PERCENTAGE, EMS, EXS, PX, CM, MM, IN, PT, PC;

skiko/src/commonMain/kotlin/org/jetbrains/skija/svg/SVGTag.kt → skiko/src/commonMain/kotlin/org/jetbrains/skia/svg/SVGTag.kt

-package org.jetbrains.skija.svg
+package org.jetbrains.skia.svg
 
 enum class SVGTag {
     CIRCLE, CLIP_PATH, DEFS, ELLIPSE, FE_BLEND, FE_COLOR_MATRIX, FE_COMPOSITE, FE_DIFFUSE_LIGHTING, FE_DISPLACEMENT_MAP, FE_DISTANT_LIGHT, FE_FLOOD, FE_GAUSSIAN_BLUR, FE_IMAGE, FE_MORPHOLOGY, FE_OFFSET, FE_POINT_LIGHT, FE_SPECULAR_LIGHTING, FE_SPOT_LIGHT, FE_TURBULENCE, FILTER, G, IMAGE, LINE, LINEAR_GRADIENT, MASK, PATH, PATTERN, POLYGON, POLYLINE, RADIAL_GRADIENT, RECT, STOP, SVG, TEXT, TEXT_LITERAL, TEXTPATH, TSPAN, USE;

skiko/src/jvmMain/cpp/common/BackendRenderTarget.cc

@@ -7,12 +7,12 @@ static void deleteBackendRenderTarget(GrBackendRenderTarget* rt) {
     delete rt;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BackendRenderTarget__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTarget__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteBackendRenderTarget));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BackendRenderTarget__1nMakeGL
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTarget__1nMakeGL
   (JNIEnv* env, jclass jclass, jint width, jint height, jint sampleCnt, jint stencilBits, jint fbId, jint fbFormat) {
     GrGLFramebufferInfo glInfo = { static_cast<unsigned int>(fbId), static_cast<unsigned int>(fbFormat) };
     GrBackendRenderTarget* instance = new GrBackendRenderTarget(width, height, sampleCnt, stencilBits, glInfo);
@@ -20,7 +20,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BackendRenderTarget_
 }
 
 #ifdef SK_METAL
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BackendRenderTarget__1nMakeMetal
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTarget__1nMakeMetal
   (JNIEnv* env, jclass jclass, jint width, jint height, jlong texturePtr) {
     GrMTLHandle texture = reinterpret_cast<GrMTLHandle>(static_cast<uintptr_t>(texturePtr));
     GrMtlTextureInfo fbInfo;
@@ -33,7 +33,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BackendRenderTarget_
 #ifdef SK_DIRECT3D
 #include "d3d/GrD3DTypes.h"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BackendRenderTarget__1nMakeDirect3D
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTarget__1nMakeDirect3D
   (JNIEnv* env, jclass jclass, jint width, jint height, jlong texturePtr, jint format, jint sampleCnt, jint levelCnt) {
     GrD3DTextureResourceInfo texResInfo = {};
     ID3D12Resource* resource = reinterpret_cast<ID3D12Resource*>(static_cast<uintptr_t>(texturePtr));

skiko/src/jvmMain/cpp/common/Bitmap.cc

@@ -10,89 +10,89 @@ static void deleteBitmap(SkBitmap* instance) {
     delete instance;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Bitmap__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteBitmap));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Bitmap__1nMake
   (JNIEnv* env, jclass jclass) {
     return reinterpret_cast<jlong>(new SkBitmap());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nMakeClone
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Bitmap__1nMakeClone
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(new SkBitmap(*instance));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Bitmap__1nSwap
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Bitmap__1nSwap
   (JNIEnv* env, jclass jclass, jlong ptr, jlong otherPtr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkBitmap* other = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(otherPtr));
     instance->swap(*other);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Bitmap__1nGetImageInfo
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Bitmap__1nGetImageInfo
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return skija::ImageInfo::toJava(env, instance->info());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Bitmap__1nGetRowBytesAsPixels
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Bitmap__1nGetRowBytesAsPixels
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->rowBytesAsPixels();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nIsNull
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nIsNull
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->isNull();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nGetRowBytes
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Bitmap__1nGetRowBytes
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->rowBytes();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nSetAlphaType
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nSetAlphaType
   (JNIEnv* env, jclass jclass, jlong ptr, jint alphaType) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->setAlphaType(static_cast<SkAlphaType>(alphaType));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nComputeByteSize
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Bitmap__1nComputeByteSize
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->computeByteSize();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nIsImmutable
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nIsImmutable
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->isImmutable();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Bitmap__1nSetImmutable
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Bitmap__1nSetImmutable
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     instance->setImmutable();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Bitmap__1nReset
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Bitmap__1nReset
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     instance->reset();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nComputeIsOpaque
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nComputeIsOpaque
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return SkBitmap::ComputeIsOpaque(*instance);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nSetImageInfo
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nSetImageInfo
   (JNIEnv* env, jclass jclass, jlong ptr, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong rowBytes) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
@@ -104,7 +104,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nSetImag
     return instance->setInfo(imageInfo, rowBytes);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nAllocPixelsFlags
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nAllocPixelsFlags
   (JNIEnv* env, jclass jclass, jlong ptr, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jint flags) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
@@ -116,7 +116,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nAllocPi
     return instance->tryAllocPixelsFlags(imageInfo, flags);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nAllocPixelsRowBytes
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nAllocPixelsRowBytes
   (JNIEnv* env, jclass jclass, jlong ptr, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong rowBytes) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
@@ -128,7 +128,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nAllocPi
     return instance->tryAllocPixels(imageInfo, rowBytes);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nInstallPixels
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nInstallPixels
   (JNIEnv* env, jclass jclass, jlong ptr, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jbyteArray pixelsArr, jlong rowBytes) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
@@ -144,13 +144,13 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nInstall
     return instance->installPixels(imageInfo, pixels, rowBytes, deleteJBytes, nullptr);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nAllocPixels
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nAllocPixels
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->tryAllocPixels();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nGetPixelRef
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Bitmap__1nGetPixelRef
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkPixelRef* pixelRef = instance->pixelRef();
@@ -158,70 +158,70 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nGetPixelRe
     return reinterpret_cast<jlong>(pixelRef);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nGetPixelRefOrigin
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Bitmap__1nGetPixelRefOrigin
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkIPoint origin = instance->pixelRefOrigin();
     return packIPoint(origin);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Bitmap__1nSetPixelRef
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Bitmap__1nSetPixelRef
   (JNIEnv* env, jclass jclass, jlong ptr, jlong pixelRefPtr, jint dx, jint dy) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkPixelRef* pixelRef = reinterpret_cast<SkPixelRef*>(static_cast<uintptr_t>(pixelRefPtr));
     instance->setPixelRef(sk_ref_sp<SkPixelRef>(pixelRef), dx, dy);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nIsReadyToDraw
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nIsReadyToDraw
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->readyToDraw();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Bitmap__1nGetGenerationId
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Bitmap__1nGetGenerationId
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->getGenerationID();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Bitmap__1nNotifyPixelsChanged
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Bitmap__1nNotifyPixelsChanged
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     instance->notifyPixelsChanged();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Bitmap__1nEraseColor
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Bitmap__1nEraseColor
   (JNIEnv* env, jclass jclass, jlong ptr, jint color) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     instance->eraseColor(color);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Bitmap__1nErase
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Bitmap__1nErase
   (JNIEnv* env, jclass jclass, jlong ptr, jint color, jint left, jint top, jint right, jint bottom) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     instance->erase(color, {left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Bitmap__1nGetColor
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Bitmap__1nGetColor
   (JNIEnv* env, jclass jclass, jlong ptr, jint x, jint y) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->getColor(x, y);
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Bitmap__1nGetAlphaf
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Bitmap__1nGetAlphaf
   (JNIEnv* env, jclass jclass, jlong ptr, jint x, jint y) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     return instance->getAlphaf(x, y);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Bitmap__1nExtractSubset
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Bitmap__1nExtractSubset
   (JNIEnv* env, jclass jclass, jlong ptr, jlong dstPtr, jint left, jint top, jint right, jint bottom) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkBitmap* dst = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(dstPtr));
     return instance->extractSubset(dst, {left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skija_Bitmap__1nReadPixels
+extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skia_Bitmap__1nReadPixels
   (JNIEnv* env, jclass jclass, jlong ptr, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong rowBytes, jint srcX, jint srcY) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
@@ -237,7 +237,7 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skija_Bitmap__1nReadP
         return nullptr;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Bitmap__1nExtractAlpha
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Bitmap__1nExtractAlpha
   (JNIEnv* env, jclass jclass, jlong ptr, jlong dstPtr, jlong paintPtr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkBitmap* dst = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(dstPtr));
@@ -249,7 +249,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Bitmap__1nExtractA
         return nullptr;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Bitmap__1nPeekPixels
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Bitmap__1nPeekPixels
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     SkPixmap pixmap;
@@ -259,7 +259,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Bitmap__1nPeekPixe
         return nullptr;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Bitmap__1nMakeShader
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Bitmap__1nMakeShader
   (JNIEnv* env, jclass jclass, jlong ptr, jint tmx, jint tmy, jlong samplingMode, jfloatArray localMatrixArr) {
     SkBitmap* instance = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(ptr));
     std::unique_ptr<SkMatrix> localMatrix = skMatrix(env, localMatrixArr);

skiko/src/jvmMain/cpp/common/BreakIterator.cc

@@ -6,11 +6,11 @@ static void deleteBreakIterator(UBreakIterator* instance) {
   ubrk_close(instance);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BreakIterator__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BreakIterator__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteBreakIterator));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BreakIterator__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BreakIterator__1nMake
   (JNIEnv* env, jclass jclass, jint type, jstring localeStr) {
     UErrorCode status = U_ZERO_ERROR;
     UBreakIterator* instance;
@@ -28,7 +28,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_BreakIterator__1nMak
       return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nClone
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nClone
   (JNIEnv* env, jclass jclass, jlong ptr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     UErrorCode status = U_ZERO_ERROR;
@@ -40,61 +40,61 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nClon
       return reinterpret_cast<jlong>(clone);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nCurrent
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nCurrent
   (JNIEnv* env, jclass jclass, jlong ptr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_current(instance);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nNext
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nNext
   (JNIEnv* env, jclass jclass, jlong ptr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_next(instance);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nPrevious
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nPrevious
   (JNIEnv* env, jclass jclass, jlong ptr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_previous(instance);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nFirst
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nFirst
   (JNIEnv* env, jclass jclass, jlong ptr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_first(instance);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nLast
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nLast
   (JNIEnv* env, jclass jclass, jlong ptr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_last(instance);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nPreceding
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nPreceding
   (JNIEnv* env, jclass jclass, jlong ptr, jint offset) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_preceding(instance, offset);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nFollowing
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nFollowing
   (JNIEnv* env, jclass jclass, jlong ptr, jint offset) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_following(instance, offset);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_BreakIterator__1nIsBoundary
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_BreakIterator__1nIsBoundary
   (JNIEnv* env, jclass jclass, jlong ptr, jint offset) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_isBoundary(instance, offset);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_BreakIterator__1nGetRuleStatus
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_BreakIterator__1nGetRuleStatus
   (JNIEnv* env, jclass jclass, jlong ptr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     return ubrk_getRuleStatus(instance);
 }
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_BreakIterator__1nGetRuleStatuses
+extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skia_BreakIterator__1nGetRuleStatuses
   (JNIEnv* env, jclass jclass, jlong ptr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     UErrorCode status = U_ZERO_ERROR;
@@ -108,7 +108,7 @@ extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_BreakIterator__1
     return javaIntArray(env, vec);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_BreakIterator__1nSetText
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_BreakIterator__1nSetText
   (JNIEnv* env, jclass jclass, jlong ptr, jlong textPtr) {
     UBreakIterator* instance = reinterpret_cast<UBreakIterator*>(static_cast<uintptr_t>(ptr));
     std::vector<jchar>* text = reinterpret_cast<std::vector<jchar>*>(static_cast<uintptr_t>(textPtr));

skiko/src/jvmMain/cpp/common/Canvas.cc

@@ -12,25 +12,25 @@ static void deleteCanvas(SkCanvas* canvas) {
     delete canvas;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Canvas__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Canvas__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteCanvas));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Canvas__1nMakeFromBitmap
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Canvas__1nMakeFromBitmap
   (JNIEnv* env, jclass jclass, jlong bitmapPtr, jint flags, jint pixelGeometry) {
     SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(bitmapPtr));
     SkCanvas* canvas = new SkCanvas(*bitmap, {static_cast<uint32_t>(flags), static_cast<SkPixelGeometry>(pixelGeometry)});
     return reinterpret_cast<jlong>(canvas);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPoint
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawPoint
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat x, jfloat y, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     canvas->drawPoint(x, y, *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPoints
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawPoints
   (JNIEnv* env, jclass jclass, jlong canvasPtr, int mode, jfloatArray coords, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
@@ -41,42 +41,42 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPoints
     env->ReleasePrimitiveArrayCritical(coords, arr, 0);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawLine
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawLine
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     canvas->drawLine(x0, y0, x1, y1, *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawArc
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawArc
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloat startAngle, jfloat sweepAngle, jboolean includeCenter, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     canvas->drawArc({left, top, right, bottom}, startAngle, sweepAngle, includeCenter, *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawRect
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawRect
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     canvas->drawRect({left, top, right, bottom}, *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawOval
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawOval
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     canvas->drawOval({left, top, right, bottom}, *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawRRect
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawRRect
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     canvas->drawRRect(skija::RRect::toSkRRect(env, left, top, right, bottom, jradii), *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawDRRect
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawDRRect
   (JNIEnv* env, jclass jclass, jlong canvasPtr,
    jfloat ol, jfloat ot, jfloat oright, jfloat ob, jfloatArray ojradii,
    jfloat il, jfloat it, jfloat ir, jfloat ib, jfloatArray ijradii,
@@ -87,7 +87,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawDRRect
         skija::RRect::toSkRRect(env, il, it, ir, ib, ijradii), *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPath
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawPath
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong pathPtr, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
@@ -95,7 +95,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPath
     canvas->drawPath(*path, *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawImageRect
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawImageRect
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong imagePtr, jfloat sl, jfloat st, jfloat sr, jfloat sb, jfloat dl, jfloat dt, jfloat dr, jfloat db, jlong samplingMode, jlong paintPtr, jboolean strict) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkImage* image = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(imagePtr));
@@ -106,7 +106,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawImageRe
     canvas->drawImageRect(image, src, dst, skija::SamplingMode::unpack(samplingMode), paint, constraint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawImageNine
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawImageNine
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong imagePtr, jint cl, jint ct, jint cr, jint cb, jfloat dl, jfloat dt, jfloat dr, jfloat db, jint filterMode, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkImage* image = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(imagePtr));
@@ -116,7 +116,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawImageNi
     canvas->drawImageNine(image, center, dst, static_cast<SkFilterMode>(filterMode), paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawRegion
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawRegion
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong regionPtr, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
@@ -124,7 +124,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawRegion
     canvas->drawRegion(*region, *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawString
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawString
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jstring stringObj, jfloat x, jfloat y, jlong skFontPtr, jlong paintPtr) {
     SkCanvas* canvas    = reinterpret_cast<SkCanvas*>   (static_cast<uintptr_t>(canvasPtr));
     SkString string     = skString(env, stringObj);
@@ -135,7 +135,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawString
 }
 
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawTextBlob
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawTextBlob
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong blobPtr, jfloat x, jfloat y, jlong paintPtr) {
     SkCanvas* canvas    = reinterpret_cast<SkCanvas*>   (static_cast<uintptr_t>(canvasPtr));
     SkTextBlob* blob    = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(blobPtr));
@@ -144,7 +144,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawTextBlo
     canvas->drawTextBlob(blob, x, y, *paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPicture
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawPicture
   (JNIEnv* env, jclass jclass, jlong ptr, jlong picturePtr, jfloatArray matrixArr, jlong paintPtr) {
     SkCanvas* canvas   = reinterpret_cast<SkCanvas*>   (static_cast<uintptr_t>(ptr));
     SkPicture* picture = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(picturePtr));
@@ -153,7 +153,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPicture
     canvas->drawPicture(picture, matrix.get(), paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawVertices
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawVertices
   (JNIEnv* env, jclass jclass, jlong ptr, jint verticesMode, jfloatArray positionsArr, jintArray colorsArr, jfloatArray texCoordsArr, jshortArray indexArr, jint blendMode, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>   (static_cast<uintptr_t>(ptr));
     int indexCount = indexArr == nullptr ? 0 : env->GetArrayLength(indexArr);
@@ -180,7 +180,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawVertice
     env->ReleaseFloatArrayElements(positionsArr, positions, 0);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPatch
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawPatch
   (JNIEnv* env, jclass jclass, jlong ptr, jfloatArray cubicsArr, jintArray colorsArr, jfloatArray texCoordsArr, jint blendMode, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>   (static_cast<uintptr_t>(ptr));
     jfloat* cubics    = env->GetFloatArrayElements(cubicsArr, 0);
@@ -196,7 +196,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPatch
     env->ReleaseFloatArrayElements(cubicsArr, cubics, 0);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawDrawable
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawDrawable
   (JNIEnv* env, jclass jclass, jlong ptr, jlong drawablePtr, jfloatArray matrixArr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
     SkDrawable* drawable = reinterpret_cast<SkDrawable*>(static_cast<uintptr_t>(drawablePtr));
@@ -204,32 +204,32 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawDrawabl
     canvas->drawDrawable(drawable, matrix.get());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nClear(JNIEnv* env, jclass jclass, jlong ptr, jint color) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nClear(JNIEnv* env, jclass jclass, jlong ptr, jint color) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
     canvas->clear(color);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nDrawPaint
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawPaint
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     canvas->drawPaint(*paint);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nSetMatrix
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nSetMatrix
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloatArray matrixArr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     std::unique_ptr<SkMatrix> matrix = skMatrix(env, matrixArr);
     canvas->setMatrix(*matrix);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nResetMatrix
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nResetMatrix
   (JNIEnv* env, jclass jclass, jlong canvasPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     canvas->resetMatrix();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Canvas__1nGetLocalToDevice
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Canvas__1nGetLocalToDevice
 (JNIEnv* env, jclass jclass, jlong canvasPtr) {
   SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
   SkM44 matrix = canvas->getLocalToDevice();
@@ -238,72 +238,72 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Canvas__1nGetLocal
   return javaFloatArray(env, floats);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nClipRect
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nClipRect
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jint mode, jboolean antiAlias) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     canvas->clipRect({left, top, right, bottom}, static_cast<SkClipOp>(mode), antiAlias);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nClipRRect
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nClipRRect
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint mode, jboolean antiAlias) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     canvas->clipRRect(skija::RRect::toSkRRect(env, left, top, right, bottom, jradii), static_cast<SkClipOp>(mode), antiAlias);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nClipPath
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nClipPath
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong pathPtr, jint mode, jboolean antiAlias) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     canvas->clipPath(*path, static_cast<SkClipOp>(mode), antiAlias);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nClipRegion
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nClipRegion
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong regionPtr, jint mode) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     canvas->clipRegion(*region, static_cast<SkClipOp>(mode));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nConcat
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nConcat
   (JNIEnv* env, jclass jclass, jlong ptr, jfloatArray matrixArr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
     std::unique_ptr<SkMatrix> m = skMatrix(env, matrixArr);
     canvas->concat(*m);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nConcat44
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nConcat44
   (JNIEnv* env, jclass jclass, jlong ptr, jfloatArray matrixArr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
     std::unique_ptr<SkM44> m = skM44(env, matrixArr);
     canvas->concat(*m);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Canvas__1nReadPixels
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Canvas__1nReadPixels
   (JNIEnv* env, jclass jclass, jlong ptr, jlong bitmapPtr, jint srcX, jint srcY) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
     SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(bitmapPtr));
     return canvas->readPixels(*bitmap, srcX, srcY);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Canvas__1nWritePixels
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Canvas__1nWritePixels
   (JNIEnv* env, jclass jclass, jlong ptr, jlong bitmapPtr, jint x, jint y) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
     SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(bitmapPtr));
     return canvas->writePixels(*bitmap, x, y);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Canvas__1nSave(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Canvas__1nSave(JNIEnv* env, jclass jclass, jlong ptr) {
     return reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr))->save();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Canvas__1nSaveLayer
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Canvas__1nSaveLayer
   (JNIEnv* env, jclass jclass, jlong ptr, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     return canvas->saveLayer(nullptr, paint);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Canvas__1nSaveLayerRect
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Canvas__1nSaveLayerRect
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat left, jfloat top, jfloat right, jfloat bottom, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
     SkRect bounds {left, top, right, bottom};
@@ -311,14 +311,14 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Canvas__1nSaveLayerRe
     return canvas->saveLayer(&bounds, paint);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Canvas__1nGetSaveCount(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Canvas__1nGetSaveCount(JNIEnv* env, jclass jclass, jlong ptr) {
     return reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr))->getSaveCount();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nRestore(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nRestore(JNIEnv* env, jclass jclass, jlong ptr) {
     reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr))->restore();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Canvas__1nRestoreToCount(JNIEnv* env, jclass jclass, jlong ptr, jint saveCount) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nRestoreToCount(JNIEnv* env, jclass jclass, jlong ptr, jint saveCount) {
     reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr))->restoreToCount(saveCount);
 }
\ No newline at end of file

skiko/src/jvmMain/cpp/common/Codec.cc

@@ -9,42 +9,42 @@ static void deleteCodec(SkCodec* instance) {
     delete instance;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Codec__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Codec__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteCodec));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Codec__1nMakeFromData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Codec__1nMakeFromData
   (JNIEnv* env, jclass jclass, jlong dataPtr) {
     SkData* data = reinterpret_cast<SkData*>(static_cast<uintptr_t>(dataPtr));
     std::unique_ptr<SkCodec> instance = SkCodec::MakeFromData(sk_ref_sp(data));
     return reinterpret_cast<jlong>(instance.release());
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Codec__1nGetImageInfo
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Codec__1nGetImageInfo
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     return skija::ImageInfo::toJava(env, instance->getInfo());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Codec__1nGetSize
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Codec__1nGetSize
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     return packISize(instance->dimensions());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Codec__1nGetEncodedOrigin
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Codec__1nGetEncodedOrigin
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     return static_cast<jint>(instance->getOrigin());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Codec__1nGetEncodedImageFormat
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Codec__1nGetEncodedImageFormat
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     return static_cast<jint>(instance->getEncodedFormat());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Codec__1nReadPixels
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Codec__1nReadPixels
   (JNIEnv* env, jclass jclass, jlong ptr, jlong bitmapPtr, jint frame, jint priorFrame) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(bitmapPtr));
@@ -55,13 +55,13 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Codec__1nReadPixels
     return static_cast<jint>(result);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Codec__1nGetFrameCount
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Codec__1nGetFrameCount
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     return instance->getFrameCount();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Codec__1nGetFrameInfo
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Codec__1nGetFrameInfo
   (JNIEnv* env, jclass jclass, jlong ptr, jint frame) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     SkCodec::FrameInfo info;
@@ -69,7 +69,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Codec__1nGetFrameI
     return skija::AnimationFrameInfo::toJava(env, info);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Codec__1nGetFramesInfo
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Codec__1nGetFramesInfo
   (JNIEnv* env, jclass jclass, jlong ptr, jint frame) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     SkCodec::FrameInfo info;
@@ -84,7 +84,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Codec__1nGetFrames
     return res;
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Codec__1nGetRepetitionCount
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Codec__1nGetRepetitionCount
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkCodec* instance = reinterpret_cast<SkCodec*>(static_cast<uintptr_t>(ptr));
     return instance->getRepetitionCount();

skiko/src/jvmMain/cpp/common/ColorFilter.cc

@@ -8,7 +8,7 @@
 #include "SkTableColorFilter.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeComposed
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeComposed
   (JNIEnv* env, jclass jclass, jlong outerPtr, jlong innerPtr) {
     SkColorFilter* outer = reinterpret_cast<SkColorFilter*>(static_cast<uintptr_t>(outerPtr));
     SkColorFilter* inner = reinterpret_cast<SkColorFilter*>(static_cast<uintptr_t>(innerPtr));
@@ -16,7 +16,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeC
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeBlend
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeBlend
   (JNIEnv* env, jclass jclass, jint colorInt, jint modeInt) {
     SkColor color = static_cast<SkColor>(colorInt);
     SkBlendMode mode = static_cast<SkBlendMode>(modeInt);
@@ -24,7 +24,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeB
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeMatrix
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeMatrix
   (JNIEnv* env, jclass jclass, jfloatArray rowMajorArray) {
     jfloat* rowMajor = env->GetFloatArrayElements(rowMajorArray, 0);
     SkColorFilter* ptr = SkColorFilters::Matrix(rowMajor).release();
@@ -32,7 +32,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeM
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeHSLAMatrix
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeHSLAMatrix
   (JNIEnv* env, jclass jclass, jfloatArray rowMajorArray) {
     jfloat* rowMajor = env->GetFloatArrayElements(rowMajorArray, 0);
     SkColorFilter* ptr = SkColorFilters::HSLAMatrix(rowMajor).release();
@@ -40,19 +40,19 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeH
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nGetLinearToSRGBGamma
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nGetLinearToSRGBGamma
   (JNIEnv* env, jclass jclass) {
     SkColorFilter* ptr = SkColorFilters::LinearToSRGBGamma().release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nGetSRGBToLinearGamma
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nGetSRGBToLinearGamma
   (JNIEnv* env, jclass jclass) {
     SkColorFilter* ptr = SkColorFilters::SRGBToLinearGamma().release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeLerp
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeLerp
   (JNIEnv* env, jclass jclass, jfloat t, jlong dstPtr, jlong srcPtr) {
     SkColorFilter* dst = reinterpret_cast<SkColorFilter*>(static_cast<uintptr_t>(dstPtr));
     SkColorFilter* src = reinterpret_cast<SkColorFilter*>(static_cast<uintptr_t>(srcPtr));
@@ -60,20 +60,20 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeL
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeLighting
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeLighting
   (JNIEnv* env, jclass jclass, jint mul, jint add) {
     SkColorFilter* ptr = SkColorMatrixFilter::MakeLightingFilter(mul, add).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeHighContrast
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeHighContrast
   (JNIEnv* env, jclass jclass, jboolean grayscale, jint inverionModeInt, jfloat contrast) {
     SkHighContrastConfig config(grayscale, static_cast<SkHighContrastConfig::InvertStyle>(inverionModeInt), contrast);
     SkColorFilter* ptr = SkHighContrastFilter::Make(config).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeTable
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeTable
   (JNIEnv* env, jclass jclass, jbyteArray tableArray) {
     jbyte* table = env->GetByteArrayElements(tableArray, 0);
     SkColorFilter* ptr = SkTableColorFilter::Make(reinterpret_cast<uint8_t*>(table)).release();
@@ -81,7 +81,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeT
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeTableARGB
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeTableARGB
   (JNIEnv* env, jclass jclass, jbyteArray arrayA, jbyteArray arrayR, jbyteArray arrayG, jbyteArray arrayB) {
     jbyte* a = arrayA ? env->GetByteArrayElements(arrayA, 0) : nullptr;
     jbyte* r = arrayR ? env->GetByteArrayElements(arrayR, 0) : nullptr;
@@ -98,7 +98,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeT
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeOverdraw
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nMakeOverdraw
   (JNIEnv* env, jclass jclass, jint c0, jint c1, jint c2, jint c3, jint c4, jint c5) {
     SkColor colors[6];
     colors[0] = c0;
@@ -111,7 +111,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nMakeO
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorFilter__1nGetLuma
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorFilter__1nGetLuma
   (JNIEnv* env, jclass jclass) {
     SkColorFilter* ptr = SkLumaColorFilter::Make().release();
     return reinterpret_cast<jlong>(ptr);

skiko/src/jvmMain/cpp/common/ColorSpace.cc

@@ -8,26 +8,26 @@ static void unrefColorSpace(SkColorSpace* ptr) {
     ptr->unref();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorSpace__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorSpace__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&unrefColorSpace));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorSpace__1nMakeSRGB(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorSpace__1nMakeSRGB(JNIEnv* env, jclass jclass) {
     SkColorSpace* ptr = SkColorSpace::MakeSRGB().release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorSpace__1nMakeSRGBLinear(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorSpace__1nMakeSRGBLinear(JNIEnv* env, jclass jclass) {
     SkColorSpace* ptr = SkColorSpace::MakeSRGBLinear().release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorSpace__1nMakeDisplayP3(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorSpace__1nMakeDisplayP3(JNIEnv* env, jclass jclass) {
     SkColorSpace* ptr = SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, SkNamedGamut::kDisplayP3).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_ColorSpace__1nConvert
+extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skia_ColorSpace__1nConvert
   (JNIEnv* env, jclass jclass, jlong fromPtr, jlong toPtr, float r, float g, float b, float a) {
     SkColorSpace* from = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(fromPtr));
     SkColorSpace* to = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(toPtr));
@@ -45,19 +45,19 @@ extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_ColorSpace__1n
     return javaFloatArray(env, {r1, g1, b1, a1});
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorSpace__1nIsGammaCloseToSRGB
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorSpace__1nIsGammaCloseToSRGB
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkColorSpace* instance = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(ptr));
     return instance->gammaCloseToSRGB();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorSpace__1nIsGammaLinear
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorSpace__1nIsGammaLinear
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkColorSpace* instance = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(ptr));
     return instance->gammaIsLinear();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorSpace__1nIsSRGB
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorSpace__1nIsSRGB
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkColorSpace* instance = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(ptr));
     return instance->isSRGB();

skiko/src/jvmMain/cpp/common/ColorType.cc

 #include <jni.h>
 #include "SkImageInfo.h"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ColorType__1nIsAlwaysOpaque
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ColorType__1nIsAlwaysOpaque
   (JNIEnv* env, jclass jclass, jint value) {
     return SkColorTypeIsAlwaysOpaque(static_cast<SkColorType>(value));
 }

skiko/src/jvmMain/cpp/common/Data.cc

@@ -7,23 +7,23 @@ static void deleteData(SkData* data) {
     data->unref();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Data__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteData));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nSize
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Data__1nSize
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkData* instance = reinterpret_cast<SkData*>(static_cast<uintptr_t>(ptr));
     return instance->size();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Data__1nToByteBuffer
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Data__1nToByteBuffer
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkData* instance = reinterpret_cast<SkData*>(static_cast<uintptr_t>(ptr));
     return env->NewDirectByteBuffer(instance->writable_data(), instance->size());
 }
 
-extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skija_Data__1nBytes
+extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skia_Data__1nBytes
   (JNIEnv* env, jclass jclass, jlong ptr, jlong offset, jlong length) {
     SkData* instance = reinterpret_cast<SkData*>(static_cast<uintptr_t>(ptr));
     jbyteArray bytesArray = env->NewByteArray((jsize) length);
@@ -32,14 +32,14 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skija_Data__1nBytes
     return bytesArray;
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Data__1nEquals
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Data__1nEquals
   (JNIEnv* env, jclass jclass, jlong ptr, jlong otherPtr) {
     SkData* instance = reinterpret_cast<SkData*>(static_cast<uintptr_t>(ptr));
     SkData* other = reinterpret_cast<SkData*>(static_cast<uintptr_t>(otherPtr));
     return instance->equals(other);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nMakeFromBytes
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Data__1nMakeFromBytes
   (JNIEnv* env, jclass jclass, jbyteArray bytesArray, jlong offset, jlong length) {
     jbyte* bytes = reinterpret_cast<jbyte*>(malloc(length));
     if (!bytes) return 0;
@@ -48,21 +48,21 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nMakeFromByte
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nMakeFromFileName
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Data__1nMakeFromFileName
   (JNIEnv* env, jclass jclass, jstring pathStr) {
     SkString path = skString(env, pathStr);
     SkData* instance = SkData::MakeFromFileName(path.c_str()).release();
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nMakeSubset
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Data__1nMakeSubset
   (JNIEnv* env, jclass jclass, jlong ptr, jlong offset, jlong length) {
     SkData* instance = reinterpret_cast<SkData*>(static_cast<uintptr_t>(ptr));
     SkData* subset = SkData::MakeSubset(instance, offset, length).release();
     return reinterpret_cast<jlong>(subset);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Data__1nMakeEmpty
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Data__1nMakeEmpty
   (JNIEnv* env, jclass jclass) {
     SkData* instance = SkData::MakeEmpty().release();
     return reinterpret_cast<jlong>(instance);

skiko/src/jvmMain/cpp/common/DirectContext.cc

@@ -2,7 +2,7 @@
 #include <jni.h>
 #include "GrDirectContext.h"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_DirectContext__1nMakeGL
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContext__1nMakeGL
   (JNIEnv* env, jclass jclass) {
     return reinterpret_cast<jlong>(GrDirectContext::MakeGL().release());
 }
@@ -10,7 +10,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_DirectContext__1nMak
 #ifdef SK_METAL
 #include "mtl/GrMtlBackendContext.h"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_DirectContext__1nMakeMetal
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContext__1nMakeMetal
   (JNIEnv* env, jclass jclass, long devicePtr, long queuePtr) {
     GrMtlBackendContext backendContext = {};
     GrMTLHandle device = reinterpret_cast<GrMTLHandle>(static_cast<uintptr_t>(devicePtr));
@@ -25,7 +25,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_DirectContext__1nMak
 #ifdef SK_DIRECT3D
 #include "d3d/GrD3DBackendContext.h"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_DirectContext__1nMakeDirect3D
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContext__1nMakeDirect3D
   (JNIEnv* env, jclass jclass, jlong adapterPtr, jlong devicePtr, jlong queuePtr) {
     GrD3DBackendContext backendContext = {};
     IDXGIAdapter1* adapter = reinterpret_cast<IDXGIAdapter1*>(static_cast<uintptr_t>(adapterPtr));
@@ -39,25 +39,25 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_DirectContext__1nMak
 }
 #endif //SK_DIRECT3D 
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_DirectContext__1nFlush
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_DirectContext__1nFlush
   (JNIEnv* env, jclass jclass, jlong ptr) {
     GrDirectContext* context = reinterpret_cast<GrDirectContext*>(static_cast<uintptr_t>(ptr));
     context->flush(GrFlushInfo());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_DirectContext__1nSubmit
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_DirectContext__1nSubmit
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean syncCpu) {
     GrDirectContext* context = reinterpret_cast<GrDirectContext*>(static_cast<uintptr_t>(ptr));
     context->submit(syncCpu);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_DirectContext__1nReset
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_DirectContext__1nReset
   (JNIEnv* env, jclass jclass, jlong ptr, jint flags) {
     GrDirectContext* context = reinterpret_cast<GrDirectContext*>(static_cast<uintptr_t>(ptr));
     context->resetContext((uint32_t) flags);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_DirectContext__1nAbandon
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_DirectContext__1nAbandon
   (JNIEnv* env, jclass jclass, jlong ptr, jint flags) {
     GrDirectContext* context = reinterpret_cast<GrDirectContext*>(static_cast<uintptr_t>(ptr));
     context->abandonContext();

skiko/src/jvmMain/cpp/common/Drawable.cc

@@ -38,19 +38,19 @@ private:
     jobject fObject;
 };
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Drawable__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Drawable__1nMake
   (JNIEnv* env, jclass jclass) {
     SkijaDrawableImpl* instance = new SkijaDrawableImpl();
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Drawable__1nInit
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Drawable__1nInit
   (JNIEnv* env, jobject jthis, jlong ptr) {
     SkijaDrawableImpl* instance = reinterpret_cast<SkijaDrawableImpl*>(static_cast<uintptr_t>(ptr));
     instance->init(env, jthis);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Drawable__1nDraw
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Drawable__1nDraw
   (JNIEnv* env, jclass jclass, jlong ptr, jlong canvasPtr, jfloatArray matrixArr) {
     SkijaDrawableImpl* instance = reinterpret_cast<SkijaDrawableImpl*>(static_cast<uintptr_t>(ptr));
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
@@ -58,19 +58,19 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Drawable__1nDraw
     instance->draw(canvas, matrix.get());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Drawable__1nMakePictureSnapshot
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Drawable__1nMakePictureSnapshot
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkijaDrawableImpl* instance = reinterpret_cast<SkijaDrawableImpl*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(instance->newPictureSnapshot());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Drawable__1nGetGenerationId
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Drawable__1nGetGenerationId
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkijaDrawableImpl* instance = reinterpret_cast<SkijaDrawableImpl*>(static_cast<uintptr_t>(ptr));
     return instance->getGenerationID();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Drawable__1nNotifyDrawingChanged
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Drawable__1nNotifyDrawingChanged
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkijaDrawableImpl* instance = reinterpret_cast<SkijaDrawableImpl*>(static_cast<uintptr_t>(ptr));
     return instance->notifyDrawingChanged();

skiko/src/jvmMain/cpp/common/Font.cc

@@ -6,210 +6,209 @@
 #include "interop.hh"
 
 static void deleteFont(SkFont* font) {
-    // std::cout << "Deleting [Font " << font << "]" << std::endl;
     delete font;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteFont));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nMakeDefault
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nMakeDefault
   (JNIEnv* env, jclass jclass) {
     SkFont* obj = new SkFont();
     return reinterpret_cast<jlong>(obj);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nMakeTypeface
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nMakeTypeface
   (JNIEnv* env, jclass jclass, jlong typefacePtr) {
     SkTypeface* typeface = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(typefacePtr));
     SkFont* obj = new SkFont(sk_ref_sp<SkTypeface>(typeface));
     return reinterpret_cast<jlong>(obj);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nMakeTypefaceSize
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nMakeTypefaceSize
   (JNIEnv* env, jclass jclass, jlong typefacePtr, jfloat size) {
     SkTypeface* typeface = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(typefacePtr));
     SkFont* obj = new SkFont(sk_ref_sp<SkTypeface>(typeface), size);
     return reinterpret_cast<jlong>(obj);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nMakeTypefaceSizeScaleSkew
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nMakeTypefaceSizeScaleSkew
   (JNIEnv* env, jclass jclass, jlong typefacePtr, jfloat size, jfloat scaleX, jfloat skewX) {
     SkTypeface* typeface = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(typefacePtr));
     SkFont* obj = new SkFont(sk_ref_sp<SkTypeface>(typeface), size, scaleX, skewX);
     return reinterpret_cast<jlong>(obj);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nMakeClone
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nMakeClone
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkFont* clone = new SkFont(*instance);
     return reinterpret_cast<jlong>(clone);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Font__1nEquals
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Font__1nEquals
   (JNIEnv* env, jclass jclass, jlong ptr, jlong otherPtr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkFont* other = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(otherPtr));
     return *instance == *other;
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Font__1nIsAutoHintingForced
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Font__1nIsAutoHintingForced
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->isForceAutoHinting();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Font__1nAreBitmapsEmbedded
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Font__1nAreBitmapsEmbedded
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->isEmbeddedBitmaps();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Font__1nIsSubpixel
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Font__1nIsSubpixel
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->isSubpixel();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Font__1nAreMetricsLinear
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Font__1nAreMetricsLinear
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->isLinearMetrics();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Font__1nIsEmboldened
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Font__1nIsEmboldened
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->isEmbolden();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Font__1nIsBaselineSnapped
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Font__1nIsBaselineSnapped
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->isBaselineSnap();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetAutoHintingForced
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetAutoHintingForced
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setForceAutoHinting(value);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetBitmapsEmbedded
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetBitmapsEmbedded
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setEmbeddedBitmaps(value);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetSubpixel
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetSubpixel
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setSubpixel(value);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetMetricsLinear
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetMetricsLinear
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setLinearMetrics(value);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetEmboldened
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetEmboldened
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setEmbolden(value);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetBaselineSnapped
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetBaselineSnapped
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setBaselineSnap(value);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Font__1nGetEdging
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Font__1nGetEdging
  (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return static_cast<jint>(instance->getEdging());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetEdging
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetEdging
  (JNIEnv* env, jclass jclass, jlong ptr, jint value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setEdging(static_cast<SkFont::Edging>(value));
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Font__1nGetHinting
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Font__1nGetHinting
  (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return static_cast<jint>(instance->getHinting());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetHinting
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetHinting
  (JNIEnv* env, jclass jclass, jlong ptr, jint value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setHinting(static_cast<SkFontHinting>(value));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nGetTypeface
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nGetTypeface
  (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkTypeface* typeface = instance->refTypeface().release();
     return reinterpret_cast<jlong>(typeface);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nGetTypefaceOrDefault
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nGetTypefaceOrDefault
  (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkTypeface* typeface = instance->refTypefaceOrDefault().release();
     return reinterpret_cast<jlong>(typeface);
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Font__1nGetSize
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Font__1nGetSize
  (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->getSize();
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Font__1nGetScaleX
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Font__1nGetScaleX
  (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->getScaleX();
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Font__1nGetSkewX
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Font__1nGetSkewX
  (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->getSkewX();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetTypeface
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetTypeface
  (JNIEnv* env, jclass jclass, jlong ptr, jlong typefacePtr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkTypeface* typeface = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(typefacePtr));
     instance->setTypeface(sk_ref_sp(typeface));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetSize
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetSize
  (JNIEnv* env, jclass jclass, jlong ptr, jfloat value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setSize(value);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetScaleX
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetScaleX
  (JNIEnv* env, jclass jclass, jlong ptr, jfloat value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setScaleX(value);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Font__1nSetSkewX
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Font__1nSetSkewX
  (JNIEnv* env, jclass jclass, jlong ptr, jfloat value) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     instance->setSkewX(value);
 }
 
-extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_Font__1nGetStringGlyphs
+extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skia_Font__1nGetStringGlyphs
   (JNIEnv* env, jclass jclass, jlong ptr, jstring str) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     jsize len = env->GetStringLength(str);
@@ -221,7 +220,7 @@ extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_Font__1nGetStr
     return javaShortArray(env, glyphs);
 }
 
-extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_Font__1nGetUTF32Glyphs
+extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skia_Font__1nGetUTF32Glyphs
   (JNIEnv* env, jclass jclass, jlong ptr, jintArray uniArr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     int count = env->GetArrayLength(uniArr);
@@ -232,13 +231,13 @@ extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_Font__1nGetUTF
     return javaShortArray(env, glyphs);
 }
 
-extern "C" JNIEXPORT jshort JNICALL Java_org_jetbrains_skija_Font__1nGetUTF32Glyph
+extern "C" JNIEXPORT jshort JNICALL Java_org_jetbrains_skia_Font__1nGetUTF32Glyph
   (JNIEnv* env, jclass jclass, jlong ptr, jint uni) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->unicharToGlyph(uni);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Font__1nGetStringGlyphsCount
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Font__1nGetStringGlyphsCount
   (JNIEnv* env, jclass jclass, jlong ptr, jstring str) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     jsize len = env->GetStringLength(str);
@@ -248,7 +247,7 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Font__1nGetStringGlyp
     return count;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Font__1nMeasureText
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Font__1nMeasureText
   (JNIEnv* env, jclass jclass, jlong ptr, jstring str, jlong paintPtr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
@@ -260,7 +259,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Font__1nMeasureTex
     return skija::Rect::fromSkRect(env, bounds);
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Font__1nMeasureTextWidth
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Font__1nMeasureTextWidth
   (JNIEnv* env, jclass jclass, jlong ptr, jstring str, jlong paintPtr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
@@ -271,7 +270,7 @@ extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Font__1nMeasureText
     return width;
 }
 
-extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_Font__1nGetWidths
+extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skia_Font__1nGetWidths
   (JNIEnv* env, jclass jclass, jlong ptr, jshortArray glyphsArr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     int count = env->GetArrayLength(glyphsArr);
@@ -282,7 +281,7 @@ extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_Font__1nGetWid
     return javaFloatArray(env, widths);
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Font__1nGetBounds
+extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skia_Font__1nGetBounds
   (JNIEnv* env, jclass jclass, jlong ptr, jshortArray glyphsArr, jlong paintPtr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
@@ -301,7 +300,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Font__1nGetBo
     return res;
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Font__1nGetPositions
+extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skia_Font__1nGetPositions
   (JNIEnv* env, jclass jclass, jlong ptr, jshortArray glyphsArr, jfloat dx, jfloat dy) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     
@@ -314,7 +313,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Font__1nGetPo
     return skija::Point::fromSkPoints(env, positions);
 }
 
-extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_Font__1nGetXPositions
+extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skia_Font__1nGetXPositions
   (JNIEnv* env, jclass jclass, jlong ptr, jshortArray glyphsArr, jfloat dx) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     int count = env->GetArrayLength(glyphsArr);
@@ -325,7 +324,7 @@ extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_Font__1nGetXPo
     return javaFloatArray(env, positions);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nGetPath
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Font__1nGetPath
   (JNIEnv* env, jclass jclass, jlong ptr, jshort glyph) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkPath* path = new SkPath();
@@ -333,7 +332,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Font__1nGetPath
     return reinterpret_cast<jlong>(path);
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Font__1nGetPaths
+extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skia_Font__1nGetPaths
   (JNIEnv* env, jclass jclass, jlong ptr, jshortArray glyphsArr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     
@@ -362,7 +361,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Font__1nGetPa
     return ctx.paths;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Font__1nGetMetrics
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Font__1nGetMetrics
   (JNIEnv* env, jclass jclass, jlong ptr, jshortArray glyphsArr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     SkFontMetrics m;
@@ -370,7 +369,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Font__1nGetMetrics
     return skija::FontMetrics::toJava(env, m);
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Font__1nGetSpacing
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Font__1nGetSpacing
   (JNIEnv* env, jclass jclass, jlong ptr, jshortArray glyphsArr) {
     SkFont* instance = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(ptr));
     return instance->getSpacing();

skiko/src/jvmMain/cpp/common/FontMgr.cc

@@ -5,13 +5,13 @@
 #include "SkTypeface.h"
 #include "SkFontMgr.h"
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_FontMgr__1nGetFamiliesCount
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_FontMgr__1nGetFamiliesCount
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFontMgr* instance = reinterpret_cast<SkFontMgr*>(static_cast<uintptr_t>(ptr));
     return instance->countFamilies();
 }
 
-extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skija_FontMgr__1nGetFamilyName
+extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skia_FontMgr__1nGetFamilyName
   (JNIEnv* env, jclass jclass, jlong ptr, jint index) {
     SkFontMgr* instance = reinterpret_cast<SkFontMgr*>(static_cast<uintptr_t>(ptr));
     SkString familyName;
@@ -19,14 +19,14 @@ extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skija_FontMgr__1nGetFami
     return javaString(env, familyName);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMakeStyleSet
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontMgr__1nMakeStyleSet
   (JNIEnv* env, jclass jclass, jlong ptr, jint index) {
     SkFontMgr* instance = reinterpret_cast<SkFontMgr*>(static_cast<uintptr_t>(ptr));
     SkFontStyleSet* styleSet = instance->createStyleSet(index);
     return reinterpret_cast<jlong>(styleSet);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMatchFamily
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontMgr__1nMatchFamily
   (JNIEnv* env, jclass jclass, jlong ptr, jstring familyNameStr) {
     SkFontMgr* instance = reinterpret_cast<SkFontMgr*>(static_cast<uintptr_t>(ptr));
     SkString familyName = skString(env, familyNameStr);
@@ -34,7 +34,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMatchFami
     return reinterpret_cast<jlong>(styleSet);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMatchFamilyStyle
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontMgr__1nMatchFamilyStyle
   (JNIEnv* env, jclass jclass, jlong ptr, jstring familyNameStr, jint fontStyle) {
     SkFontMgr* instance = reinterpret_cast<SkFontMgr*>(static_cast<uintptr_t>(ptr));
     SkString familyName = skString(env, familyNameStr);
@@ -42,7 +42,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMatchFami
     return reinterpret_cast<jlong>(typeface);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMatchFamilyStyleCharacter
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontMgr__1nMatchFamilyStyleCharacter
   (JNIEnv* env, jclass jclass, jlong ptr, jstring familyNameStr, jint fontStyle, jobjectArray bcp47Array, jint character) {
     SkFontMgr* instance = reinterpret_cast<SkFontMgr*>(static_cast<uintptr_t>(ptr));
 
@@ -58,7 +58,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMatchFami
     return reinterpret_cast<jlong>(typeface);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMakeFromData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontMgr__1nMakeFromData
   (JNIEnv* env, jclass jclass, jlong ptr, jlong dataPtr, jint ttcIndex) {
     SkFontMgr* instance = reinterpret_cast<SkFontMgr*>(static_cast<uintptr_t>(ptr));
     SkData* data = reinterpret_cast<SkData*>(static_cast<uintptr_t>(dataPtr));
@@ -66,7 +66,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nMakeFromD
     return reinterpret_cast<jlong>(typeface);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontMgr__1nDefault
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontMgr__1nDefault
   (JNIEnv* env, jclass jclass) {
     SkFontMgr* instance = SkFontMgr::RefDefault().release();
     return reinterpret_cast<jlong>(instance);

skiko/src/jvmMain/cpp/common/FontStyleSet.cc

@@ -4,19 +4,19 @@
 #include "SkTypeface.h"
 #include "SkFontMgr.h"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontStyleSet__1nMakeEmpty
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontStyleSet__1nMakeEmpty
   (JNIEnv* env, jclass jclass) {
     SkFontStyleSet* instance = SkFontStyleSet::CreateEmpty();
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_FontStyleSet__1nCount
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_FontStyleSet__1nCount
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkFontStyleSet* instance = reinterpret_cast<SkFontStyleSet*>(static_cast<uintptr_t>(ptr));
     return instance->count();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_FontStyleSet__1nGetStyle
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_FontStyleSet__1nGetStyle
   (JNIEnv* env, jclass jclass, jlong ptr, jint index) {
     SkFontStyleSet* instance = reinterpret_cast<SkFontStyleSet*>(static_cast<uintptr_t>(ptr));
     SkFontStyle fontStyle;
@@ -24,7 +24,7 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_FontStyleSet__1nGetSt
     return fontStyle.weight() + (fontStyle.width() << 16) + (fontStyle.slant() << 24);
 }
 
-extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skija_FontStyleSet__1nGetStyleName
+extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skia_FontStyleSet__1nGetStyleName
   (JNIEnv* env, jclass jclass, jlong ptr, jint index) {
     SkFontStyleSet* instance = reinterpret_cast<SkFontStyleSet*>(static_cast<uintptr_t>(ptr));
     SkString style;
@@ -32,14 +32,14 @@ extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skija_FontStyleSet__1nGe
     return javaString(env, style);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontStyleSet__1nGetTypeface
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontStyleSet__1nGetTypeface
   (JNIEnv* env, jclass jclass, jlong ptr, jint index) {
     SkFontStyleSet* instance = reinterpret_cast<SkFontStyleSet*>(static_cast<uintptr_t>(ptr));
     SkTypeface* typeface = instance->createTypeface(index);
     return reinterpret_cast<jlong>(typeface);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_FontStyleSet__1nMatchStyle
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_FontStyleSet__1nMatchStyle
   (JNIEnv* env, jclass jclass, jlong ptr, jint fontStyle) {
     SkFontStyleSet* instance = reinterpret_cast<SkFontStyleSet*>(static_cast<uintptr_t>(ptr));
     SkTypeface* typeface = instance->matchStyle(skija::FontStyle::fromJava(fontStyle));

skiko/src/jvmMain/cpp/common/Image.cc

@@ -4,7 +4,7 @@
 #include "SkImage.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeRaster
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Image__1nMakeRaster
   (JNIEnv* env, jclass jclass, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jbyteArray bytesArr, jlong rowBytes) {
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
     SkImageInfo imageInfo = SkImageInfo::Make(width,
@@ -18,7 +18,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeRaster
     return reinterpret_cast<jlong>(image.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeRasterData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Image__1nMakeRasterData
   (JNIEnv* env, jclass jclass, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong dataPtr, jlong rowBytes) {
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
     SkImageInfo imageInfo = SkImageInfo::Make(width,
@@ -31,21 +31,21 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeRasterD
     return reinterpret_cast<jlong>(image.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeFromBitmap
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Image__1nMakeFromBitmap
   (JNIEnv* env, jclass jclass, jlong bitmapPtr) {
     SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(bitmapPtr));
     sk_sp<SkImage> image = SkImage::MakeFromBitmap(*bitmap);
     return reinterpret_cast<jlong>(image.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeFromPixmap
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Image__1nMakeFromPixmap
   (JNIEnv* env, jclass jclass, jlong pixmapPtr) {
     SkPixmap* pixmap = reinterpret_cast<SkPixmap*>(static_cast<uintptr_t>(pixmapPtr));
     sk_sp<SkImage> image = SkImage::MakeFromRaster(*pixmap, nullptr, nullptr);
     return reinterpret_cast<jlong>(image.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeFromEncoded
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Image__1nMakeFromEncoded
   (JNIEnv* env, jclass jclass, jbyteArray encodedArray) {
     jsize encodedLen = env->GetArrayLength(encodedArray);
     jbyte* encoded = env->GetByteArrayElements(encodedArray, 0);
@@ -57,20 +57,20 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeFromEnc
     return reinterpret_cast<jlong>(image.release());
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Image__1nGetImageInfo
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Image__1nGetImageInfo
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkImage* instance = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(ptr));
     return skija::ImageInfo::toJava(env, instance->imageInfo());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nEncodeToData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Image__1nEncodeToData
   (JNIEnv* env, jclass jclass, jlong ptr, jint format, jint quality) {
     SkImage* instance = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(ptr));
     SkData* data = instance->encodeToData(static_cast<SkEncodedImageFormat>(format), quality).release();
     return reinterpret_cast<jlong>(data);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeShader
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Image__1nMakeShader
   (JNIEnv* env, jclass jclass, jlong ptr, jint tmx, jint tmy, jlong sampling, jfloatArray localMatrixArr) {
     SkImage* instance = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(ptr));
     std::unique_ptr<SkMatrix> localMatrix = skMatrix(env, localMatrixArr);
@@ -78,7 +78,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Image__1nMakeShader
     return reinterpret_cast<jlong>(shader.release());
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Image__1nPeekPixels
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Image__1nPeekPixels
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkImage* instance = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(ptr));
     SkPixmap pixmap;
@@ -88,14 +88,14 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Image__1nPeekPixel
         return nullptr;
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Image__1nPeekPixelsToPixmap
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Image__1nPeekPixelsToPixmap
   (JNIEnv* env, jclass jclass, jlong ptr, jlong pixmapPtr) {
     SkImage* instance = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(ptr));
     SkPixmap* pixmap = reinterpret_cast<SkPixmap*>(static_cast<uintptr_t>(pixmapPtr));
     return instance->peekPixels(pixmap);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Image__1nReadPixelsBitmap
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Image__1nReadPixelsBitmap
   (JNIEnv* env, jclass jclass, jlong ptr, jlong contextPtr, jlong bitmapPtr, jint srcX, jint srcY, jboolean cache) {
     SkImage* instance = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(ptr));
     GrDirectContext* context = reinterpret_cast<GrDirectContext*>(static_cast<uintptr_t>(contextPtr));
@@ -104,7 +104,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Image__1nReadPixe
     return instance->readPixels(context, bitmap->info(), bitmap->getPixels(), bitmap->pixmap().rowBytes(), srcX, srcY, cachingHint);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Image__1nReadPixelsPixmap
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Image__1nReadPixelsPixmap
   (JNIEnv* env, jclass jclass, jlong ptr, jlong pixmapPtr, jint srcX, jint srcY, jboolean cache) {
     SkImage* instance = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(ptr));
     SkPixmap* pixmap = reinterpret_cast<SkPixmap*>(static_cast<uintptr_t>(pixmapPtr));
@@ -112,7 +112,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Image__1nReadPixe
     return instance->readPixels(*pixmap, srcX, srcY, cachingHint);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Image__1nScalePixels
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Image__1nScalePixels
   (JNIEnv* env, jclass jclass, jlong ptr, jlong pixmapPtr, jlong samplingOptions, jboolean cache) {
     SkImage* instance = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(ptr));
     SkPixmap* pixmap = reinterpret_cast<SkPixmap*>(static_cast<uintptr_t>(pixmapPtr));

skiko/src/jvmMain/cpp/common/ImageFilter.cc

@@ -8,7 +8,7 @@
 #include "SkRect.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeAlphaThreshold
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeAlphaThreshold
   (JNIEnv* env, jclass jclass, jlong regionPtr, jfloat innerMin, jfloat outerMax, jlong inputPtr, jobject cropObj) {
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
@@ -17,7 +17,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeA
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeArithmetic
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeArithmetic
   (JNIEnv* env, jclass jclass, jfloat k1, jfloat k2, jfloat k3, jfloat k4, jboolean enforcePMColor, jlong bgPtr, jlong fgPtr, jobject cropObj) {
     SkImageFilter* bg = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(bgPtr));
     SkImageFilter* fg = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(fgPtr));
@@ -26,7 +26,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeA
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeBlend
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeBlend
   (JNIEnv* env, jclass jclass, jint blendModeInt, jlong bgPtr, jlong fgPtr, jobject cropObj) {
     SkBlendMode blendMode = static_cast<SkBlendMode>(blendModeInt);
     SkImageFilter* bg = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(bgPtr));
@@ -36,7 +36,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeB
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeBlur
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeBlur
   (JNIEnv* env, jclass jclass, jfloat sigmaX, jfloat sigmaY, jint tileModeInt, jlong inputPtr, jobject cropObj) {
     SkTileMode tileMode = static_cast<SkTileMode>(tileModeInt);
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
@@ -45,7 +45,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeB
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeColorFilter
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeColorFilter
   (JNIEnv* env, jclass jclass, jlong colorFilterPtr, jlong inputPtr, jobject cropObj) {
     SkColorFilter* colorFilter = reinterpret_cast<SkColorFilter*>(static_cast<uintptr_t>(colorFilterPtr));
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
@@ -54,7 +54,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeC
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeCompose
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeCompose
   (JNIEnv* env, jclass jclass, jlong outerPtr, jlong innerPtr) {
     SkImageFilter* outer = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(outerPtr));
     SkImageFilter* inner = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(innerPtr));
@@ -62,7 +62,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeC
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeDisplacementMap
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeDisplacementMap
   (JNIEnv* env, jclass jclass, jint xChanInt, jint yChanInt, jfloat scale, jlong displacementPtr, jlong colorPtr, jobject cropObj) {
     SkColorChannel xChan = static_cast<SkColorChannel>(xChanInt);
     SkColorChannel yChan = static_cast<SkColorChannel>(yChanInt);
@@ -73,7 +73,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeD
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeDropShadow
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeDropShadow
   (JNIEnv* env, jclass jclass, jfloat dx, jfloat dy, jfloat sigmaX, jfloat sigmaY, jint color, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -81,7 +81,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeD
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeDropShadowOnly
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeDropShadowOnly
   (JNIEnv* env, jclass jclass, jfloat dx, jfloat dy, jfloat sigmaX, jfloat sigmaY, jint color, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -89,14 +89,14 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeD
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeImage
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeImage
   (JNIEnv* env, jclass jclass, jlong imagePtr, jfloat l0, jfloat t0, jfloat r0, jfloat b0, jfloat l1, jfloat t1, jfloat r1, jfloat b1, jlong samplingMode) {
     SkImage* image = reinterpret_cast<SkImage*>(static_cast<uintptr_t>(imagePtr));
     SkImageFilter* ptr = SkImageFilters::Image(sk_ref_sp(image), SkRect{l0, t0, r0, b0}, SkRect{l1, t1, r1, b1}, skija::SamplingMode::unpack(samplingMode)).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeMagnifier
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeMagnifier
   (JNIEnv* env, jclass jclass, jfloat l, jfloat t, jfloat r, jfloat b, jfloat inset, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -104,7 +104,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeM
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeMatrixConvolution
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeMatrixConvolution
   (JNIEnv* env, jclass jclass, jint kernelW, jint kernelH, jfloatArray kernelArray, jfloat gain, jfloat bias, jint offsetX, jint offsetY, jint tileModeInt, jboolean convolveAlpha, jlong inputPtr, jobject cropObj) {
     jfloat* kernel = env->GetFloatArrayElements(kernelArray, 0);
     SkTileMode tileMode = static_cast<SkTileMode>(tileModeInt);
@@ -115,7 +115,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeM
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeMatrixTransform
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeMatrixTransform
   (JNIEnv* env, jclass jclass, jfloatArray matrixArray, jlong samplingMode, jlong inputPtr) {
     std::unique_ptr<SkMatrix> matrix = skMatrix(env, matrixArray);
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
@@ -123,7 +123,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeM
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeMerge
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeMerge
   (JNIEnv* env, jclass jclass, jlongArray filtersArray, jobject cropObj) {
     jlong* f = env->GetLongArrayElements(filtersArray, 0);
     jsize len = env->GetArrayLength(filtersArray);
@@ -138,7 +138,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeM
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeOffset
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeOffset
   (JNIEnv* env, jclass jclass, jfloat dx, jfloat dy, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -146,7 +146,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeO
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakePaint
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakePaint
   (JNIEnv* env, jclass jclass, jlong paintPtr, jobject cropObj) {
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -154,21 +154,21 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeP
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakePicture
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakePicture
   (JNIEnv* env, jclass jclass, jlong picturePtr, jfloat l, jfloat t, jfloat r, jfloat b) {
     SkPicture* picture = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(picturePtr));
     SkImageFilter* ptr = SkImageFilters::Picture(sk_ref_sp(picture), SkRect{l, t, r, b}).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeTile
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeTile
   (JNIEnv* env, jclass jclass, jfloat l0, jfloat t0, jfloat r0, jfloat b0, jfloat l1, jfloat t1, jfloat r1, jfloat b1, jlong inputPtr) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     SkImageFilter* ptr = SkImageFilters::Tile(SkRect{l0, t0, r0, b0}, SkRect{l1, t1, r1, b1}, sk_ref_sp(input)).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeDilate
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeDilate
   (JNIEnv* env, jclass jclass, float rx, jfloat ry, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -176,7 +176,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeD
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeErode
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeErode
   (JNIEnv* env, jclass jclass, float rx, jfloat ry, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -184,7 +184,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeE
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeDistantLitDiffuse
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeDistantLitDiffuse
   (JNIEnv* env, jclass jclass, jfloat x, jfloat y, jfloat z, jint lightColor, jfloat surfaceScale, jfloat kd, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -192,7 +192,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeD
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakePointLitDiffuse
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakePointLitDiffuse
   (JNIEnv* env, jclass jclass, jfloat x, jfloat y, jfloat z, jint lightColor, jfloat surfaceScale, jfloat kd, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -200,7 +200,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeP
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeSpotLitDiffuse
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeSpotLitDiffuse
   (JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat z0, jfloat x1, jfloat y1, jfloat z1, jfloat falloffExponent, jfloat cutoffAngle, jint lightColor, jfloat surfaceScale, jfloat kd, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -208,7 +208,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeS
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeDistantLitSpecular
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeDistantLitSpecular
   (JNIEnv* env, jclass jclass, jfloat x, jfloat y, jfloat z, jint lightColor, jfloat surfaceScale, jfloat ks, jfloat shininess, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -216,7 +216,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeD
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakePointLitSpecular
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakePointLitSpecular
   (JNIEnv* env, jclass jclass, jfloat x, jfloat y, jfloat z, jint lightColor, jfloat surfaceScale, jfloat ks, jfloat shininess, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);
@@ -224,7 +224,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeP
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ImageFilter__1nMakeSpotLitSpecular
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilter__1nMakeSpotLitSpecular
   (JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat z0, jfloat x1, jfloat y1, jfloat z1, jfloat falloffExponent, jfloat cutoffAngle, jint lightColor, jfloat surfaceScale, jfloat ks, jfloat shininess, jlong inputPtr, jobject cropObj) {
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
     std::unique_ptr<SkIRect> crop = skija::IRect::toSkIRect(env, cropObj);

skiko/src/jvmMain/cpp/common/ManagedString.cc

@@ -3,41 +3,40 @@
 #include "SkString.h"
 
 static void deleteString(SkString* instance) {
-    // std::cout << "Deleting [SkString " << instance << "]" << std::endl;
     delete instance;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ManagedString__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ManagedString__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteString));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_ManagedString__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ManagedString__1nMake
   (JNIEnv* env, jclass jclass, jstring textStr) {
     SkString* text = new SkString(skString(env, textStr));
     return reinterpret_cast<jlong>(text);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_ManagedString__1nToString
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_ManagedString__1nToString
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkString* instance = reinterpret_cast<SkString*>(static_cast<uintptr_t>(ptr));
     return javaString(env, *instance);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_ManagedString__1nInsert
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_ManagedString__1nInsert
   (JNIEnv* env, jclass jclass, jlong ptr, jint offset, jstring s) {
     SkString* instance = reinterpret_cast<SkString*>(static_cast<uintptr_t>(ptr));
     skija::UtfIndicesConverter conv(*instance);
     instance->insert(conv.from16To8(offset), skString(env, s));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_ManagedString__1nAppend
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_ManagedString__1nAppend
   (JNIEnv* env, jclass jclass, jlong ptr, jstring s) {
     SkString* instance = reinterpret_cast<SkString*>(static_cast<uintptr_t>(ptr));
     instance->append(skString(env, s));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_ManagedString__1nRemoveSuffix
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_ManagedString__1nRemoveSuffix
   (JNIEnv* env, jclass jclass, jlong ptr, jint from) {
     SkString* instance = reinterpret_cast<SkString*>(static_cast<uintptr_t>(ptr));
     skija::UtfIndicesConverter conv(*instance);
@@ -45,7 +44,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_ManagedString__1nRemo
     instance->remove(from8, instance->size() - from8);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_ManagedString__1nRemove
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_ManagedString__1nRemove
   (JNIEnv* env, jclass jclass, jlong ptr, jint from, jint len) {
     SkString* instance = reinterpret_cast<SkString*>(static_cast<uintptr_t>(ptr));
     skija::UtfIndicesConverter conv(*instance);

skiko/src/jvmMain/cpp/common/MaskFilter.cc

@@ -6,28 +6,28 @@
 #include "SkTableMaskFilter.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_MaskFilter__1nMakeBlur
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_MaskFilter__1nMakeBlur
   (JNIEnv* env, jclass jclass, jint blurStyleInt, jfloat sigma, jboolean respectCTM) {
     SkBlurStyle blurStyle = static_cast<SkBlurStyle>(blurStyleInt);
     SkMaskFilter* ptr = SkMaskFilter::MakeBlur(blurStyle, sigma, respectCTM).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_MaskFilter__1nMakeShader
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_MaskFilter__1nMakeShader
   (JNIEnv* env, jclass jclass, jlong shaderPtr) {
     SkShader* shader = reinterpret_cast<SkShader*>(static_cast<uintptr_t>(shaderPtr));
     SkMaskFilter* ptr = SkShaderMaskFilter::Make(sk_ref_sp(shader)).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-// extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_MaskFilter__1nMakeEmboss
+// extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_MaskFilter__1nMakeEmboss
 //   (JNIEnv* env, jclass jclass, jfloat sigma, jfloat x, jfloat y, jfloat z, jint pad, jint ambient, jint specular) {
 //     SkEmbossMaskFilter::Light light{ {x, y, z}, pad, ambient, specular };
 //     SkMaskFilter* ptr = SkEmbossMaskFilter::Make(sigma, light).release();
 //     return reinterpret_cast<jlong>(ptr);
 // }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_MaskFilter__1nMakeTable
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_MaskFilter__1nMakeTable
   (JNIEnv* env, jclass jclass, jbyteArray tableArray) {
     jbyte* table = env->GetByteArrayElements(tableArray, 0);
     SkMaskFilter* ptr = SkTableMaskFilter::Create(reinterpret_cast<uint8_t*>(table));
@@ -35,13 +35,13 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_MaskFilter__1nMakeTa
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_MaskFilter__1nMakeGamma
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_MaskFilter__1nMakeGamma
   (JNIEnv* env, jclass jclass, jfloat gamma) {
     SkMaskFilter* ptr = SkTableMaskFilter::CreateGamma(gamma);
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_MaskFilter__1nMakeClip
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_MaskFilter__1nMakeClip
   (JNIEnv* env, jclass jclass, jbyte min, jbyte max) {
     SkMaskFilter* ptr = SkTableMaskFilter::CreateClip(static_cast<uint8_t>(min), static_cast<uint8_t>(max));
     return reinterpret_cast<jlong>(ptr);

skiko/src/jvmMain/cpp/common/OutputWStream.cc

@@ -44,12 +44,12 @@ static void deleteOutputWStream(OutputWStream* out) {
     delete out;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_OutputWStream__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_OutputWStream__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteOutputWStream));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_OutputWStream__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_OutputWStream__1nMake
   (JNIEnv* env, jclass jclass, jobject outputStream) {
     OutputWStream* instance = new OutputWStream(env, outputStream);
     return reinterpret_cast<jlong>(instance);

skiko/src/jvmMain/cpp/common/Paint.cc

@@ -10,153 +10,152 @@
 #include "interop.hh"
 
 static void deletePaint(SkPaint* paint) {
-    // std::cout << "Deleting [SkPaint " << paint << "]" << std::endl;
     delete paint;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deletePaint));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nMake
   (JNIEnv* env, jclass jclass) {
     SkPaint* obj = new SkPaint();
     obj->setAntiAlias(true);
     return reinterpret_cast<jlong>(obj);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nMakeClone
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nMakeClone
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkPaint* obj = new SkPaint(*instance);
     return reinterpret_cast<jlong>(obj);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Paint__1nEquals
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Paint__1nEquals
   (JNIEnv* env, jclass jclass, jlong aPtr, jlong bPtr) {
     SkPaint* a = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(aPtr));
     SkPaint* b = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(bPtr));
     return *a == *b;
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nReset
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nReset
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->reset();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Paint__1nIsAntiAlias
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Paint__1nIsAntiAlias
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return instance->isAntiAlias();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetAntiAlias
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetAntiAlias
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean value) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setAntiAlias(value);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Paint__1nIsDither
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Paint__1nIsDither
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return instance->isDither();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetDither
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetDither
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean value) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setDither(value);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Paint__1nGetColor
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Paint__1nGetColor
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return instance->getColor();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetColor
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetColor
   (JNIEnv* env, jclass jclass, jlong ptr, jint color) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setColor(color);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Paint__1nGetColor4f
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Paint__1nGetColor4f
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkColor4f color = instance->getColor4f();
     return env->NewObject(skija::Color4f::cls, skija::Color4f::ctor, color.fR, color.fG, color.fB, color.fA);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetColor4f
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetColor4f
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat r, jfloat g, jfloat b, jfloat a, jlong colorSpacePtr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
     instance->setColor4f({r, g, b, a}, colorSpace);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Paint__1nGetMode
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Paint__1nGetMode
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return static_cast<jlong>(instance->getStyle());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetMode
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetMode
   (JNIEnv* env, jclass jclass, jlong ptr, jint mode) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setStyle(static_cast<SkPaint::Style>(mode));
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Paint__1nGetStrokeWidth
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Paint__1nGetStrokeWidth
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return instance->getStrokeWidth();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetStrokeWidth
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetStrokeWidth
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat width) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setStrokeWidth(width);
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Paint__1nGetStrokeMiter
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Paint__1nGetStrokeMiter
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return instance->getStrokeMiter();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetStrokeMiter
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetStrokeMiter
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat miter) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setStrokeMiter(miter);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Paint__1nGetStrokeCap
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Paint__1nGetStrokeCap
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return static_cast<jlong>(instance->getStrokeCap());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetStrokeCap
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetStrokeCap
   (JNIEnv* env, jclass jclass, jlong ptr, jint cap) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setStrokeCap(static_cast<SkPaint::Cap>(cap));
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Paint__1nGetStrokeJoin
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Paint__1nGetStrokeJoin
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return static_cast<jlong>(instance->getStrokeJoin());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetStrokeJoin
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetStrokeJoin
   (JNIEnv* env, jclass jclass, jlong ptr, jint join) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setStrokeJoin(static_cast<SkPaint::Join>(join));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetFillPath
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nGetFillPath
   (JNIEnv* env, jclass jclass, jlong ptr, jlong srcPtr, jfloat resScale) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkPath* src = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(srcPtr));
@@ -165,7 +164,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetFillPath
     return reinterpret_cast<jlong>(dst);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetFillPathCull
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nGetFillPathCull
   (JNIEnv* env, jclass jclass, jlong ptr, jlong srcPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloat resScale) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkPath* src = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(srcPtr));
@@ -175,84 +174,84 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetFillPath
     return reinterpret_cast<jlong>(dst);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetMaskFilter
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nGetMaskFilter
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(instance->refMaskFilter().release());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetMaskFilter
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetMaskFilter
   (JNIEnv* env, jclass jclass, jlong ptr, jlong filterPtr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkMaskFilter* filter = reinterpret_cast<SkMaskFilter*>(static_cast<uintptr_t>(filterPtr));
     instance->setMaskFilter(sk_ref_sp<SkMaskFilter>(filter));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetImageFilter
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nGetImageFilter
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(instance->refImageFilter().release());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetImageFilter
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetImageFilter
   (JNIEnv* env, jclass jclass, jlong ptr, jlong filterPtr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkImageFilter* filter = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(filterPtr));
     instance->setImageFilter(sk_ref_sp<SkImageFilter>(filter));
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Paint__1nGetBlendMode
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Paint__1nGetBlendMode
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return static_cast<jlong>(instance->getBlendMode_or(SkBlendMode::kSrcOver));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetBlendMode
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetBlendMode
   (JNIEnv* env, jclass jclass, jlong ptr, jint mode) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     instance->setBlendMode(static_cast<SkBlendMode>(mode));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetPathEffect
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nGetPathEffect
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(instance->refPathEffect().release());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetPathEffect
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetPathEffect
   (JNIEnv* env, jclass jclass, jlong ptr, jlong pathEffectPtr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkPathEffect* pathEffect = reinterpret_cast<SkPathEffect*>(static_cast<uintptr_t>(pathEffectPtr));
     instance->setPathEffect(sk_ref_sp(pathEffect));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetShader
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nGetShader
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(instance->refShader().release());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetShader
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetShader
   (JNIEnv* env, jclass jclass, jlong ptr, jlong shaderPtr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkShader* shader = reinterpret_cast<SkShader*>(static_cast<uintptr_t>(shaderPtr));
     instance->setShader(sk_ref_sp<SkShader>(shader));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Paint__1nGetColorFilter
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Paint__1nGetColorFilter
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(instance->refColorFilter().release());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Paint__1nSetColorFilter
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Paint__1nSetColorFilter
   (JNIEnv* env, jclass jclass, jlong ptr, jlong colorFilterPtr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     SkColorFilter* colorFilter = reinterpret_cast<SkColorFilter*>(static_cast<uintptr_t>(colorFilterPtr));
     instance->setColorFilter(sk_ref_sp<SkColorFilter>(colorFilter));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Paint__1nHasNothingToDraw
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Paint__1nHasNothingToDraw
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPaint* instance = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(ptr));
     return instance->nothingToDraw();

skiko/src/jvmMain/cpp/common/PaintFilterCanvas.cc

@@ -35,13 +35,13 @@ private:
     float unrollDrawable;
 };
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_PaintFilterCanvas__1nAttachToJava
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_PaintFilterCanvas__1nAttachToJava
   (JNIEnv* env, jobject jobj, jlong canvasPtr, jboolean unrollDrawable) {
     SkijaPaintFilterCanvas* canvas = reinterpret_cast<SkijaPaintFilterCanvas*>(static_cast<uintptr_t>(canvasPtr));
     canvas->jobj = skija::PaintFilterCanvas::attach(env, jobj);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PaintFilterCanvas__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PaintFilterCanvas__1nMake
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jboolean unrollDrawable) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkijaPaintFilterCanvas* filterCanvas = new SkijaPaintFilterCanvas(canvas, unrollDrawable);

skiko/src/jvmMain/cpp/common/Path.cc

@@ -13,16 +13,16 @@ static void deletePath(SkPath* path) {
     delete path;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Path__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deletePath));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMake(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Path__1nMake(JNIEnv* env, jclass jclass) {
     SkPath* obj = new SkPath();
     return reinterpret_cast<jlong>(obj);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMakeFromSVGString
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Path__1nMakeFromSVGString
   (JNIEnv* env, jclass jclass, jstring d) {
     SkPath* obj = new SkPath();
     SkString s = skString(env, d);
@@ -34,19 +34,19 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMakeFromSVGS
     }
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nEquals(JNIEnv* env, jclass jclass, jlong aPtr, jlong bPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nEquals(JNIEnv* env, jclass jclass, jlong aPtr, jlong bPtr) {
     SkPath* a = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(aPtr));
     SkPath* b = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(bPtr));
     return *a == *b;
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsInterpolatable(JNIEnv* env, jclass jclass, jlong ptr, jlong comparePtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsInterpolatable(JNIEnv* env, jclass jclass, jlong ptr, jlong comparePtr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* compare = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(comparePtr));
     return instance->isInterpolatable(*compare);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMakeLerp(JNIEnv* env, jclass jclass, jlong ptr, jlong endingPtr, jfloat weight) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Path__1nMakeLerp(JNIEnv* env, jclass jclass, jlong ptr, jlong endingPtr, jfloat weight) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* ending = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(endingPtr));
     SkPath* out = new SkPath();
@@ -58,22 +58,22 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMakeLerp(JNI
     }
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetFillMode(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Path__1nGetFillMode(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return static_cast<jint>(instance->getFillType());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nSetFillMode(JNIEnv* env, jclass jclass, jlong ptr, jint fillMode) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nSetFillMode(JNIEnv* env, jclass jclass, jlong ptr, jint fillMode) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->setFillType(static_cast<SkPathFillType>(fillMode));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsConvex(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsConvex(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->isConvex();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nIsOval(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Path__1nIsOval(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkRect bounds;
     if (instance->isOval(&bounds))
@@ -82,7 +82,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nIsOval(JNI
         return nullptr;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nIsRRect(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Path__1nIsRRect(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkRRect rrect;
     if (instance->isRRect(&rrect))
@@ -91,54 +91,54 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nIsRRect(JN
         return nullptr;
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nReset(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nReset(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->reset();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nRewind(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nRewind(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->rewind();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsEmpty(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsEmpty(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->isEmpty();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsLastContourClosed(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsLastContourClosed(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->isLastContourClosed();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsFinite(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsFinite(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->isFinite();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsVolatile(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsVolatile(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->isVolatile();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nSetVolatile(JNIEnv* env, jclass jclass, jlong ptr, jboolean isVolatile) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nSetVolatile(JNIEnv* env, jclass jclass, jlong ptr, jboolean isVolatile) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->setIsVolatile(isVolatile);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsLineDegenerate(JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jboolean exact) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsLineDegenerate(JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jboolean exact) {
     return SkPath::IsLineDegenerate({x0, y0}, {x1, y1}, exact);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsQuadDegenerate(JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jboolean exact) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsQuadDegenerate(JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jboolean exact) {
     return SkPath::IsQuadDegenerate({x0, y0}, {x1, y1}, {x2, y2}, exact);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsCubicDegenerate(JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat x3, jfloat y3, jboolean exact) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsCubicDegenerate(JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat x3, jfloat y3, jboolean exact) {
     return SkPath::IsCubicDegenerate({x0, y0}, {x1, y1}, {x2, y2}, {x3, y3}, exact);
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Path__1nMaybeGetAsLine(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skia_Path__1nMaybeGetAsLine(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPoint line[2];
     if (instance->isLine(line)) {
@@ -150,18 +150,18 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Path__1nMaybe
         return nullptr;
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetPointsCount(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Path__1nGetPointsCount(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->countPoints();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nGetPoint(JNIEnv* env, jclass jclass, jlong ptr, jint index) {
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Path__1nGetPoint(JNIEnv* env, jclass jclass, jlong ptr, jint index) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPoint p = instance->getPoint(index);
     return skija::Point::fromSkPoint(env, p);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetPoints(JNIEnv* env, jclass jclass, jlong ptr, jobjectArray pointsArray, jint max) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Path__1nGetPoints(JNIEnv* env, jclass jclass, jlong ptr, jobjectArray pointsArray, jint max) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     std::vector<SkPoint> p(std::min<jint>(max, instance->countPoints()));
     int count = instance->getPoints(p.data(), max);
@@ -170,12 +170,12 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetPoints(JNI
     return count;
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nCountVerbs(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Path__1nCountVerbs(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->countVerbs();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetVerbs(JNIEnv* env, jclass jclass, jlong ptr, jbyteArray verbsArray, jint max) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Path__1nGetVerbs(JNIEnv* env, jclass jclass, jlong ptr, jbyteArray verbsArray, jint max) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     jbyte* verbs = verbsArray == nullptr ? nullptr : env->GetByteArrayElements(verbsArray, 0);
     int count = instance->getVerbs(reinterpret_cast<uint8_t *>(verbs), max);
@@ -184,119 +184,119 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetVerbs(JNIE
     return count;
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nApproximateBytesUsed(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Path__1nApproximateBytesUsed(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return (jint) instance->approximateBytesUsed();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nSwap(JNIEnv* env, jclass jclass, jlong ptr, jlong otherPtr) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nSwap(JNIEnv* env, jclass jclass, jlong ptr, jlong otherPtr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* other = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(otherPtr));
     instance->swap(*other);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nGetBounds(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Path__1nGetBounds(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return skija::Rect::fromSkRect(env, instance->getBounds());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nUpdateBoundsCache(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nUpdateBoundsCache(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->updateBoundsCache();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nComputeTightBounds(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Path__1nComputeTightBounds(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return skija::Rect::fromSkRect(env, instance->computeTightBounds());
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nConservativelyContainsRect(JNIEnv* env, jclass jclass, jlong ptr, float l, float t, float r, float b) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nConservativelyContainsRect(JNIEnv* env, jclass jclass, jlong ptr, float l, float t, float r, float b) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkRect rect {l, t, r, b};
     return instance->conservativelyContainsRect(rect);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nIncReserve(JNIEnv* env, jclass jclass, jlong ptr, int extraPtCount) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nIncReserve(JNIEnv* env, jclass jclass, jlong ptr, int extraPtCount) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->incReserve(extraPtCount);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nMoveTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x, jfloat y) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nMoveTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x, jfloat y) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->moveTo(x, y);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nRMoveTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx, jfloat dy) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nRMoveTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx, jfloat dy) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->rMoveTo(dx, dy);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nLineTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x, jfloat y) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nLineTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x, jfloat y) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->lineTo(x, y);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nRLineTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx, jfloat dy) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nRLineTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx, jfloat dy) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->rLineTo(dx, dy);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nQuadTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x1, jfloat y1, jfloat x2, jfloat y2) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nQuadTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x1, jfloat y1, jfloat x2, jfloat y2) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->quadTo(x1, y1, x2, y2);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nRQuadTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx1, jfloat dy1, jfloat dx2, jfloat dy2) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nRQuadTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx1, jfloat dy1, jfloat dx2, jfloat dy2) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->rQuadTo(dx1, dy1, dx2, dy2);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nConicTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat w) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nConicTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat w) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->conicTo(x1, y1, x2, y2, w);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nRConicTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx1, jfloat dy1, jfloat dx2, jfloat dy2, jfloat w) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nRConicTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx1, jfloat dy1, jfloat dx2, jfloat dy2, jfloat w) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->rConicTo(dx1, dy1, dx2, dy2, w);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nCubicTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat x3, jfloat y3) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nCubicTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat x3, jfloat y3) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->cubicTo(x1, y1, x2, y2, x3, y3);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nRCubicTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx1, jfloat dy1, jfloat dx2, jfloat dy2, jfloat dx3, jfloat dy3) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nRCubicTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat dx1, jfloat dy1, jfloat dx2, jfloat dy2, jfloat dx3, jfloat dy3) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->rCubicTo(dx1, dy1, dx2, dy2, dx3, dy3);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nArcTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloat startAngle, jfloat sweepAngle, jboolean forceMoveTo) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nArcTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloat startAngle, jfloat sweepAngle, jboolean forceMoveTo) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->arcTo({left, top, right, bottom}, startAngle, sweepAngle, forceMoveTo);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nTangentArcTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat radius) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nTangentArcTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat radius) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->arcTo(x1, y1, x2, y2, radius);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nEllipticalArcTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat rx, jfloat ry, jfloat xAxisRotate, jint size, jint direction, jfloat x, float y) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nEllipticalArcTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat rx, jfloat ry, jfloat xAxisRotate, jint size, jint direction, jfloat x, float y) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->arcTo(rx, ry, xAxisRotate, static_cast<SkPath::ArcSize>(size), static_cast<SkPathDirection>(direction), x, y);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nREllipticalArcTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat rx, jfloat ry, jfloat xAxisRotate, jint size, jint direction, jfloat dx, float dy) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nREllipticalArcTo(JNIEnv* env, jclass jclass, jlong ptr, jfloat rx, jfloat ry, jfloat xAxisRotate, jint size, jint direction, jfloat dx, float dy) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->rArcTo(rx, ry, xAxisRotate, static_cast<SkPath::ArcSize>(size), static_cast<SkPathDirection>(direction), dx, dy);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nClosePath(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nClosePath(JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->close();
 }
 
-extern "C" JNIEXPORT jobjectArray Java_org_jetbrains_skija_Path__1nConvertConicToQuads
+extern "C" JNIEXPORT jobjectArray Java_org_jetbrains_skia_Path__1nConvertConicToQuads
   (JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat w, jint pow2) {
     std::vector<SkPoint> pts(1 + 2 * (1 << pow2));
     int count = SkPath::ConvertConicToQuads({x0, y0}, {x1, y1}, {x2, y2}, w, pts.data(), pow2);
@@ -307,7 +307,7 @@ extern "C" JNIEXPORT jobjectArray Java_org_jetbrains_skija_Path__1nConvertConicT
     return res;
 }
 
-extern "C" JNIEXPORT jobject Java_org_jetbrains_skija_Path__1nIsRect
+extern "C" JNIEXPORT jobject Java_org_jetbrains_skia_Path__1nIsRect
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkRect rect;
@@ -317,34 +317,34 @@ extern "C" JNIEXPORT jobject Java_org_jetbrains_skija_Path__1nIsRect
         return nullptr;
 }
 
-extern "C" JNIEXPORT void Java_org_jetbrains_skija_Path__1nAddRect
+extern "C" JNIEXPORT void Java_org_jetbrains_skia_Path__1nAddRect
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jint dirInt, jint start) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPathDirection dir = static_cast<SkPathDirection>(dirInt);
     instance->addRect({l, t, r, b}, dir, start);
 }
 
-extern "C" JNIEXPORT void Java_org_jetbrains_skija_Path__1nAddOval
+extern "C" JNIEXPORT void Java_org_jetbrains_skia_Path__1nAddOval
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jint dirInt, jint start) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPathDirection dir = static_cast<SkPathDirection>(dirInt);
     instance->addOval({l, t, r, b}, dir, start);
 }
 
-extern "C" JNIEXPORT void Java_org_jetbrains_skija_Path__1nAddCircle
+extern "C" JNIEXPORT void Java_org_jetbrains_skia_Path__1nAddCircle
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat x, jfloat y, jfloat r, jint dirInt) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPathDirection dir = static_cast<SkPathDirection>(dirInt);
     instance->addCircle(x, y, r, dir);
 }
 
-extern "C" JNIEXPORT void Java_org_jetbrains_skija_Path__1nAddArc
+extern "C" JNIEXPORT void Java_org_jetbrains_skia_Path__1nAddArc
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jfloat startAngle, jfloat sweepAngle) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->addArc({l, t, r, b}, startAngle, sweepAngle);
 }
 
-extern "C" JNIEXPORT void Java_org_jetbrains_skija_Path__1nAddRRect
+extern "C" JNIEXPORT void Java_org_jetbrains_skia_Path__1nAddRRect
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jfloatArray radii, jint dirInt, jint start) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkRRect rrect = skija::RRect::toSkRRect(env, l, t, r, b, radii);
@@ -352,7 +352,7 @@ extern "C" JNIEXPORT void Java_org_jetbrains_skija_Path__1nAddRRect
     instance->addRRect(rrect, dir, start);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nAddPoly
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nAddPoly
   (JNIEnv* env, jclass jclass, jlong ptr, jfloatArray coords, jboolean close) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     jsize len = env->GetArrayLength(coords);
@@ -361,7 +361,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nAddPoly
     env->ReleaseFloatArrayElements(coords, arr, 0);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nAddPath
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nAddPath
   (JNIEnv* env, jclass jclass, jlong ptr, jlong srcPtr, jboolean extend) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* src = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(srcPtr));
@@ -369,7 +369,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nAddPath
     instance->addPath(*src, mode);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nAddPathOffset
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nAddPathOffset
   (JNIEnv* env, jclass jclass, jlong ptr, jlong srcPtr, jfloat dx, jfloat dy, jboolean extend) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* src = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(srcPtr));
@@ -377,7 +377,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nAddPathOffset
     instance->addPath(*src, dx, dy, mode);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nAddPathTransform
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nAddPathTransform
   (JNIEnv* env, jclass jclass, jlong ptr, jlong srcPtr, jfloatArray matrixArr, jboolean extend) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* src = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(srcPtr));
@@ -386,21 +386,21 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nAddPathTransf
     instance->addPath(*src, *matrix, mode);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nReverseAddPath
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nReverseAddPath
   (JNIEnv* env, jclass jclass, jlong ptr, jlong srcPtr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* src = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(srcPtr));
     instance->reverseAddPath(*src);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nOffset
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nOffset
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat dx, jfloat dy, jlong dstPtr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* dst = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(dstPtr));
     instance->offset(dx, dy, dst);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nTransform
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nTransform
   (JNIEnv* env, jclass jclass, jlong ptr, jfloatArray matrixArr, jlong dstPtr, jboolean pcBool) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPath* dst = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(dstPtr));
@@ -409,7 +409,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nTransform
     instance->transform(*matrix, dst, pc);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nGetLastPt
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Path__1nGetLastPt
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkPoint out;
@@ -419,37 +419,37 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Path__1nGetLastPt
         return nullptr;
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nSetLastPt
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nSetLastPt
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat x, jfloat y) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->setLastPt(x, y);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetSegmentMasks
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Path__1nGetSegmentMasks
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->getSegmentMasks();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nContains
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nContains
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat x, jfloat y) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->contains(x, y);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nDump
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nDump
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->dump();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Path__1nDumpHex
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Path__1nDumpHex
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     instance->dumpHex();
 }
 
-extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skija_Path__1nSerializeToBytes
+extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skia_Path__1nSerializeToBytes
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     size_t count = instance->writeToMemory(nullptr);
@@ -460,7 +460,7 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_org_jetbrains_skija_Path__1nSeriali
     return bytesArray;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMakeCombining
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Path__1nMakeCombining
   (JNIEnv* env, jclass jclass, jlong aPtr, jlong bPtr, jint jop) {
     SkPath* a = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(aPtr));
     SkPath* b = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(bPtr));
@@ -472,7 +472,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMakeCombinin
         return 0;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMakeFromBytes
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Path__1nMakeFromBytes
   (JNIEnv* env, jclass jclass, jbyteArray bytesArray) {
     SkPath* instance = new SkPath();
     int count = env->GetArrayLength(bytesArray);
@@ -487,13 +487,13 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Path__1nMakeFromByte
     }
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Path__1nGetGenerationId
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Path__1nGetGenerationId
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->getGenerationID();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Path__1nIsValid
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Path__1nIsValid
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     return instance->isValid();

skiko/src/jvmMain/cpp/common/PathEffect.cc

@@ -8,7 +8,7 @@
 #include "SkDiscretePathEffect.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeSum
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathEffect__1nMakeSum
   (JNIEnv* env, jclass jclass, jlong firstPtr, jlong secondPtr) {
     SkPathEffect* first = reinterpret_cast<SkPathEffect*>(static_cast<uintptr_t>(firstPtr));
     SkPathEffect* second = reinterpret_cast<SkPathEffect*>(static_cast<uintptr_t>(secondPtr));
@@ -16,7 +16,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeSu
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeCompose
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathEffect__1nMakeCompose
   (JNIEnv* env, jclass jclass, jlong outerPtr, jlong innerPtr) {
     SkPathEffect* outer = reinterpret_cast<SkPathEffect*>(static_cast<uintptr_t>(outerPtr));
     SkPathEffect* inner = reinterpret_cast<SkPathEffect*>(static_cast<uintptr_t>(innerPtr));
@@ -24,7 +24,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeCo
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakePath1D
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathEffect__1nMakePath1D
   (JNIEnv* env, jclass jclass, jlong pathPtr, jfloat advance, jfloat phase, jint styleInt) {
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     SkPath1DPathEffect::Style style = static_cast<SkPath1DPathEffect::Style>(styleInt);
@@ -32,7 +32,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakePa
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakePath2D
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathEffect__1nMakePath2D
   (JNIEnv* env, jclass jclass, jfloatArray matrixArr, jlong pathPtr) {
     std::unique_ptr<SkMatrix> m = skMatrix(env, matrixArr);
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
@@ -40,20 +40,20 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakePa
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeLine2D
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathEffect__1nMakeLine2D
   (JNIEnv* env, jclass jclass, jfloat width, jfloatArray matrixArr) {
     std::unique_ptr<SkMatrix> m = skMatrix(env, matrixArr);
     SkPathEffect* ptr = SkLine2DPathEffect::Make(width, *m).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeCorner
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathEffect__1nMakeCorner
   (JNIEnv* env, jclass jclass, jfloat radius) {
     SkPathEffect* ptr = SkCornerPathEffect::Make(radius).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeDash
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathEffect__1nMakeDash
   (JNIEnv* env, jclass jclass, jfloatArray intervalsArray, jfloat phase) {
     jsize len = env->GetArrayLength(intervalsArray);
     jfloat* intervals = env->GetFloatArrayElements(intervalsArray, 0);
@@ -62,7 +62,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeDa
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathEffect__1nMakeDiscrete
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathEffect__1nMakeDiscrete
   (JNIEnv* env, jclass jclass, jfloat segLength, jfloat dev, jint seed) {
     SkPathEffect* ptr = SkDiscretePathEffect::Make(segLength, dev, static_cast<uint32_t>(seed)).release();
     return reinterpret_cast<jlong>(ptr);

skiko/src/jvmMain/cpp/common/PathMeasure.cc

@@ -6,35 +6,35 @@ static void deletePathMeasure(SkPathMeasure* instance) {
     delete instance;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathMeasure__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathMeasure__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deletePathMeasure));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathMeasure__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathMeasure__1nMake
   (JNIEnv* env, jclass jclass) {
     return reinterpret_cast<jlong>(new SkPathMeasure());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathMeasure__1nMakePath
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathMeasure__1nMakePath
   (JNIEnv* env, jclass jclass, jlong pathPtr, jboolean forceClosed, jfloat resScale) {
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     return reinterpret_cast<jlong>(new SkPathMeasure(*path, forceClosed, resScale));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_PathMeasure__1nSetPath
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_PathMeasure__1nSetPath
   (JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr, jboolean forceClosed) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     instance->setPath(path, forceClosed);
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_PathMeasure__1nGetLength
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_PathMeasure__1nGetLength
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     return instance->getLength();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathMeasure__1nGetPosition
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_PathMeasure__1nGetPosition
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat distance) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     SkPoint position;
@@ -44,7 +44,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathMeasure__1nGet
         return nullptr;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathMeasure__1nGetTangent
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_PathMeasure__1nGetTangent
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat distance) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     SkVector tangent;
@@ -54,7 +54,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathMeasure__1nGet
         return nullptr;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathMeasure__1nGetRSXform
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_PathMeasure__1nGetRSXform
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat distance) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     SkPoint position;
@@ -65,7 +65,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathMeasure__1nGet
         return nullptr;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathMeasure__1nGetMatrix
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_PathMeasure__1nGetMatrix
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat distance, jboolean getPosition, jboolean getTangent) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     SkMatrix matrix;
@@ -84,20 +84,20 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathMeasure__1nGet
         return nullptr;
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_PathMeasure__1nGetSegment
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_PathMeasure__1nGetSegment
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat startD, jfloat endD, jlong dstPtr, jboolean startWithMoveTo) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     SkPath* dst = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(dstPtr));
     return instance->getSegment(startD, endD, dst, startWithMoveTo);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_PathMeasure__1nIsClosed
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_PathMeasure__1nIsClosed
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     return instance->isClosed();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_PathMeasure__1nNextContour
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_PathMeasure__1nNextContour
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPathMeasure* instance = reinterpret_cast<SkPathMeasure*>(static_cast<uintptr_t>(ptr));
     return instance->nextContour();

skiko/src/jvmMain/cpp/common/PathSegmentIterator.cc

@@ -2,7 +2,7 @@
 #include "SkPath.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathSegmentIterator__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathSegmentIterator__1nMake
   (JNIEnv* env, jclass jclass, jlong pathPtr, jboolean forceClose) {
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     SkPath::Iter* iter = new SkPath::Iter(*path, forceClose);
@@ -14,12 +14,12 @@ static void deletePathSegmentIterator(SkPath::Iter* iter) {
     delete iter;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PathSegmentIterator__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PathSegmentIterator__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deletePathSegmentIterator));
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_PathSegmentIterator__1nNext
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_PathSegmentIterator__1nNext
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPath::Iter* instance = reinterpret_cast<SkPath::Iter*>(static_cast<uintptr_t>(ptr));
     SkPoint pts[4];

skiko/src/jvmMain/cpp/common/Picture.cc

@@ -5,7 +5,7 @@
 #include "SkPicture.h"
 #include "SkShader.h"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Picture__1nMakeFromData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Picture__1nMakeFromData
   (JNIEnv* env, jclass jclass, jlong dataPtr) {
     SkData* data = reinterpret_cast<SkData*>(static_cast<uintptr_t>(dataPtr));
     SkPicture* instance = SkPicture::MakeFromData(data).release();
@@ -29,7 +29,7 @@ private:
     jobject supplier;
 };
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Picture__1nPlayback
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Picture__1nPlayback
   (JNIEnv* env, jclass jclass, jlong ptr, jlong canvasPtr, jobject abort) {
     SkPicture* instance = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(ptr));
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
@@ -41,45 +41,45 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Picture__1nPlayback
     }
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Picture__1nGetCullRect
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Picture__1nGetCullRect
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPicture* instance = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(ptr));
     return skija::Rect::fromSkRect(env, instance->cullRect());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Picture__1nGetUniqueId
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Picture__1nGetUniqueId
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPicture* instance = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(ptr));
     return instance->uniqueID();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Picture__1nSerializeToData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Picture__1nSerializeToData
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPicture* instance = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(ptr));
     SkData* data = instance->serialize().release();
     return reinterpret_cast<jlong>(data);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Picture__1nMakePlaceholder
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Picture__1nMakePlaceholder
   (JNIEnv* env, jclass jclass, jfloat left, jfloat top, jfloat right, jfloat bottom) {
     SkRect cull = SkRect::MakeLTRB(left, top, right, bottom);
     SkPicture* instance = SkPicture::MakePlaceholder(cull).release();
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Picture__1nGetApproximateOpCount
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Picture__1nGetApproximateOpCount
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPicture* instance = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(ptr));
     return instance->approximateOpCount();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Picture__1nGetApproximateBytesUsed
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Picture__1nGetApproximateBytesUsed
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPicture* instance = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(ptr));
     return instance->approximateBytesUsed();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Picture__1nMakeShader
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Picture__1nMakeShader
   (JNIEnv* env, jclass jclass, jlong ptr, jint tmxValue, jint tmyValue, jint filterModeValue, jfloatArray localMatrixArr, jobject tileRectObj) {
     SkPicture* instance = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(ptr));
     SkTileMode tmx = static_cast<SkTileMode>(tmxValue);

skiko/src/jvmMain/cpp/common/PictureRecorder.cc

@@ -9,46 +9,46 @@ static void deletePictureRecorder(SkPictureRecorder* pr) {
     delete pr;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PictureRecorder__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PictureRecorder__1nMake
   (JNIEnv* env, jclass jclass) {
     SkPictureRecorder* instance = new SkPictureRecorder();
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PictureRecorder__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PictureRecorder__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deletePictureRecorder));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PictureRecorder__1nBeginRecording
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PictureRecorder__1nBeginRecording
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat left, jfloat top, jfloat right, jfloat bottom) {
     SkPictureRecorder* instance = reinterpret_cast<SkPictureRecorder*>(static_cast<uintptr_t>(ptr));
     SkCanvas* canvas = instance->beginRecording(SkRect::MakeLTRB(left, top, right, bottom), nullptr);
     return reinterpret_cast<jlong>(canvas);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PictureRecorder__1nGetRecordingCanvas
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PictureRecorder__1nGetRecordingCanvas
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPictureRecorder* instance = reinterpret_cast<SkPictureRecorder*>(static_cast<uintptr_t>(ptr));
     SkCanvas* canvas = instance->getRecordingCanvas();
     return reinterpret_cast<jlong>(canvas);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PictureRecorder__1nFinishRecordingAsPicture
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PictureRecorder__1nFinishRecordingAsPicture
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPictureRecorder* instance = reinterpret_cast<SkPictureRecorder*>(static_cast<uintptr_t>(ptr));
     SkPicture* picture = instance->finishRecordingAsPicture().release();
     return reinterpret_cast<jlong>(picture);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PictureRecorder__1nFinishRecordingAsPictureWithCull
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PictureRecorder__1nFinishRecordingAsPictureWithCull
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat left, jfloat top, jfloat right, jfloat bottom) {
     SkPictureRecorder* instance = reinterpret_cast<SkPictureRecorder*>(static_cast<uintptr_t>(ptr));
     SkPicture* picture = instance->finishRecordingAsPictureWithCull(SkRect::MakeLTRB(left, top, right, bottom)).release();
     return reinterpret_cast<jlong>(picture);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PictureRecorder__1nFinishRecordingAsDrawable
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PictureRecorder__1nFinishRecordingAsDrawable
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPictureRecorder* instance = reinterpret_cast<SkPictureRecorder*>(static_cast<uintptr_t>(ptr));
     SkDrawable* drawable = instance->finishRecordingAsDrawable().release();

skiko/src/jvmMain/cpp/common/PixelRef.cc

@@ -2,42 +2,42 @@
 #include "SkPixelRef.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_PixelRef__1nGetWidth
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_PixelRef__1nGetWidth
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPixelRef* instance = reinterpret_cast<SkPixelRef*>(static_cast<uintptr_t>(ptr));
     return instance->width();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_PixelRef__1nGetHeight
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_PixelRef__1nGetHeight
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPixelRef* instance = reinterpret_cast<SkPixelRef*>(static_cast<uintptr_t>(ptr));
     return instance->height();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_PixelRef__1nGetRowBytes
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_PixelRef__1nGetRowBytes
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPixelRef* instance = reinterpret_cast<SkPixelRef*>(static_cast<uintptr_t>(ptr));
     return instance->rowBytes();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_PixelRef__1nGetGenerationId
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_PixelRef__1nGetGenerationId
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPixelRef* instance = reinterpret_cast<SkPixelRef*>(static_cast<uintptr_t>(ptr));
     return instance->getGenerationID();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_PixelRef__1nNotifyPixelsChanged
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_PixelRef__1nNotifyPixelsChanged
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPixelRef* instance = reinterpret_cast<SkPixelRef*>(static_cast<uintptr_t>(ptr));
     instance->notifyPixelsChanged();
 }
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_PixelRef__1nIsImmutable
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_PixelRef__1nIsImmutable
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPixelRef* instance = reinterpret_cast<SkPixelRef*>(static_cast<uintptr_t>(ptr));
     return instance->isImmutable();
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_PixelRef__1nSetImmutable
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_PixelRef__1nSetImmutable
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkPixelRef* instance = reinterpret_cast<SkPixelRef*>(static_cast<uintptr_t>(ptr));
     instance->setImmutable();

skiko/src/jvmMain/cpp/common/Pixmap.cc

@@ -7,17 +7,17 @@ static void deletePixmap(SkPixmap *pixmap) {
 }
 
 extern "C" {
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Pixmap__1nGetFinalizer
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Pixmap__1nGetFinalizer
       (JNIEnv *env, jclass klass) {
         return ptrToJlong(&deletePixmap);
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Pixmap__1nMakeNull
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Pixmap__1nMakeNull
       (JNIEnv *env, jclass klass) {
         return ptrToJlong(new SkPixmap());
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Pixmap__1nMake
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Pixmap__1nMake
       (JNIEnv *env, jclass klass,
       jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong pixelsPtr, jint rowBytes) {
         SkColorSpace* colorSpace = jlongToPtr<SkColorSpace*>(colorSpacePtr);
@@ -30,13 +30,13 @@ extern "C" {
             imageInfo, jlongToPtr<void*>(pixelsPtr), rowBytes));
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skija_Pixmap__1nReset
+    JNIEXPORT void JNICALL Java_org_jetbrains_skia_Pixmap__1nReset
       (JNIEnv *env, jclass klass, jlong ptr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         pixmap->reset();
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skija_Pixmap__1nResetWithInfo
+    JNIEXPORT void JNICALL Java_org_jetbrains_skia_Pixmap__1nResetWithInfo
       (JNIEnv *env, jclass klass, jlong ptr,
       jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong pixelsPtr, jint rowBytes) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
@@ -49,14 +49,14 @@ extern "C" {
         pixmap->reset(imageInfo, jlongToPtr<void*>(pixelsPtr), rowBytes);
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skija_Pixmap__1nSetColorSpace
+    JNIEXPORT void JNICALL Java_org_jetbrains_skia_Pixmap__1nSetColorSpace
       (JNIEnv *env, jclass klass, jlong ptr, jlong colorSpacePtr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         SkColorSpace* colorSpace = jlongToPtr<SkColorSpace*>(colorSpacePtr);
         pixmap->setColorSpace(sk_ref_sp<SkColorSpace>(colorSpace));
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nExtractSubset
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nExtractSubset
       (JNIEnv *env, jclass klass, jlong ptr,
       jlong subsetPtr, jint l, jint t, jint w, jint h) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
@@ -64,62 +64,62 @@ extern "C" {
         return pixmap->extractSubset(dst, { l, t, w, h });
     }
 
-    JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Pixmap__1nGetInfo
+    JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Pixmap__1nGetInfo
       (JNIEnv *env, jclass klass, jlong ptr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         const SkImageInfo& imageInfo = pixmap->info();
         return skija::ImageInfo::toJava(env, imageInfo);
     }
 
-    JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Pixmap__1nGetRowBytes
+    JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Pixmap__1nGetRowBytes
       (JNIEnv *env, jclass klass, jlong ptr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return static_cast<jint>(pixmap->rowBytes());
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Pixmap__1nGetAddr
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Pixmap__1nGetAddr
       (JNIEnv *env, jclass klass, jlong ptr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return ptrToJlong(pixmap->addr());
     }
 
-    JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Pixmap__1nGetRowBytesAsPixels
+    JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Pixmap__1nGetRowBytesAsPixels
       (JNIEnv *env, jclass klass, jlong ptr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return static_cast<jint>(pixmap->rowBytesAsPixels());
     }
 
-    JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Pixmap__1nComputeByteSize
+    JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Pixmap__1nComputeByteSize
       (JNIEnv *env, jclass klass, jlong ptr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return static_cast<jint>(pixmap->computeByteSize());
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nComputeIsOpaque
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nComputeIsOpaque
       (JNIEnv *env, jclass klass, jlong ptr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return static_cast<jboolean>(pixmap->computeIsOpaque());
     }
 
-    JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Pixmap__1nGetColor
+    JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Pixmap__1nGetColor
       (JNIEnv *env, jclass klass, jlong ptr, jint x, jint y) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return static_cast<jint>(pixmap->getColor(x, y));
     }
 
-    JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_Pixmap__1nGetAlphaF
+    JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_Pixmap__1nGetAlphaF
       (JNIEnv *env, jclass klass, jlong ptr, jint x, jint y) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return static_cast<jfloat>(pixmap->getAlphaf(x, y));
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Pixmap__1nGetAddrAt
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Pixmap__1nGetAddrAt
       (JNIEnv *env, jclass klass, jlong ptr, jint x, jint y) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return reinterpret_cast<jlong>(pixmap->addr(x, y));
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nReadPixels
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nReadPixels
       (JNIEnv *env, jclass klass, jlong ptr,
       jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong pixelsPtr, jint rowBytes) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
@@ -132,7 +132,7 @@ extern "C" {
         return static_cast<jboolean>(pixmap->readPixels(imageInfo, jlongToPtr<void*>(pixelsPtr), rowBytes));
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nReadPixelsFromPoint
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nReadPixelsFromPoint
       (JNIEnv *env, jclass klass, jlong ptr,
       jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong pixelsPtr, jint rowBytes,
       jint srcX, jint srcY) {
@@ -146,34 +146,34 @@ extern "C" {
         return static_cast<jboolean>(pixmap->readPixels(imageInfo, jlongToPtr<void*>(pixelsPtr), rowBytes, srcX, srcY));
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nReadPixelsToPixmap
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nReadPixelsToPixmap
       (JNIEnv *env, jclass klass, jlong ptr, jlong dstPixmapPtr) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         SkPixmap* dstPixmap = jlongToPtr<SkPixmap*>(dstPixmapPtr);
         return static_cast<jboolean>(pixmap->readPixels(*dstPixmap));
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nReadPixelsToPixmapFromPoint
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nReadPixelsToPixmapFromPoint
       (JNIEnv *env, jclass klass, jlong ptr, jlong dstPixmapPtr, jint srcX, jint srcY) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         SkPixmap* dstPixmap = jlongToPtr<SkPixmap*>(dstPixmapPtr);
         return static_cast<jboolean>(pixmap->readPixels(*dstPixmap, srcX, srcY));
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nScalePixels
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nScalePixels
       (JNIEnv *env, jclass klass, jlong ptr, jlong dstPixmapPtr, jlong samplingOptions) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         SkPixmap* dstPixmap = jlongToPtr<SkPixmap*>(dstPixmapPtr);
         return static_cast<jboolean>(pixmap->scalePixels(*dstPixmap, skija::SamplingMode::unpack(samplingOptions)));
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nErase
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nErase
       (JNIEnv *env, jclass klass, jlong ptr, jint color) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return static_cast<jboolean>(pixmap->erase(color));
     }
 
-    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Pixmap__1nEraseSubset
+    JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Pixmap__1nEraseSubset
       (JNIEnv *env, jclass klass, jlong ptr, jint color, jint l, jint t, jint w, jint h) {
         SkPixmap* pixmap = jlongToPtr<SkPixmap*>(ptr);
         return static_cast<jboolean>(pixmap->erase(color, { l, t, w, h }));

skiko/src/jvmMain/cpp/common/Region.cc

@@ -8,63 +8,63 @@ static void deleteRegion(SkRegion* region) {
     delete region;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Region__1nMake(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Region__1nMake(JNIEnv* env, jclass jclass) {
     SkRegion* obj = new SkRegion();
     return reinterpret_cast<jlong>(obj);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Region__1nGetFinalizer(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Region__1nGetFinalizer(JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteRegion));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nSet(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nSet(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* other = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->set(*other);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nIsEmpty(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nIsEmpty(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->isEmpty();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nIsRect(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nIsRect(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->isRect();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nIsComplex(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nIsComplex(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->isComplex();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Region__1nGetBounds(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Region__1nGetBounds(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return skija::IRect::fromSkIRect(env, instance->getBounds());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Region__1nComputeRegionComplexity(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Region__1nComputeRegionComplexity(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->computeRegionComplexity();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nGetBoundaryPath(JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nGetBoundaryPath(JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     return instance->getBoundaryPath(path);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nSetEmpty(JNIEnv* env, jclass jclass, jlong ptr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nSetEmpty(JNIEnv* env, jclass jclass, jlong ptr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->setEmpty();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nSetRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nSetRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->setRect({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nSetRects(JNIEnv* env, jclass jclass, jlong ptr, jintArray coords) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nSetRects(JNIEnv* env, jclass jclass, jlong ptr, jintArray coords) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     int len = env->GetArrayLength(coords);
     std::vector<SkIRect> rects(len / 4);
@@ -75,91 +75,91 @@ extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nSetRect
     return instance->setRects(rects.data(), len / 4);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nSetRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nSetRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->setRegion(*region);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nSetPath(JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nSetPath(JNIEnv* env, jclass jclass, jlong ptr, jlong pathPtr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkPath* path = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(pathPtr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->setPath(*path, *region);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nIntersectsIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nIntersectsIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->intersects({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nIntersectsRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nIntersectsRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->intersects(*region);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nContainsIPoint(JNIEnv* env, jclass jclass, jlong ptr, jint x, jint y) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nContainsIPoint(JNIEnv* env, jclass jclass, jlong ptr, jint x, jint y) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->contains(x, y);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nContainsIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nContainsIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->contains({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nContainsRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nContainsRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->contains(*region);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nQuickContains(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nQuickContains(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->quickContains({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nQuickRejectIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nQuickRejectIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->quickReject({left, top, right, bottom});
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nQuickRejectRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nQuickRejectRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->contains(*region);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Region__1nTranslate(JNIEnv* env, jclass jclass, jlong ptr, jint dx, jint dy) {
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Region__1nTranslate(JNIEnv* env, jclass jclass, jlong ptr, jint dx, jint dy) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     instance->translate(dx, dy);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nOpIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nOpIRect(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     return instance->op({left, top, right, bottom}, static_cast<SkRegion::Op>(op));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nOpRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nOpRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->op(*region, static_cast<SkRegion::Op>(op));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nOpIRectRegion(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom, jlong regionPtr, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nOpIRectRegion(JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom, jlong regionPtr, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->op({left, top, right, bottom}, *region, static_cast<SkRegion::Op>(op));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nOpRegionIRect(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr, jint left, jint top, jint right, jint bottom, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nOpRegionIRect(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtr, jint left, jint top, jint right, jint bottom, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* region = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtr));
     return instance->op(*region, {left, top, right, bottom}, static_cast<SkRegion::Op>(op));
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Region__1nOpRegionRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtrA, jlong regionPtrB, jint op) {
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Region__1nOpRegionRegion(JNIEnv* env, jclass jclass, jlong ptr, jlong regionPtrA, jlong regionPtrB, jint op) {
     SkRegion* instance = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(ptr));
     SkRegion* regionA = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtrA));
     SkRegion* regionB = reinterpret_cast<SkRegion*>(static_cast<uintptr_t>(regionPtrB));

skiko/src/jvmMain/cpp/common/RuntimeEffect.cc

@@ -4,7 +4,7 @@
 #include "interop.hh"
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_org_jetbrains_skija_RuntimeEffect__1nMakeShader(JNIEnv* env,
+Java_org_jetbrains_skia_RuntimeEffect__1nMakeShader(JNIEnv* env,
                                                      jclass jclass,
                                                      jlong ptr,
                                                      jlong uniformPtr,
@@ -33,7 +33,7 @@ Java_org_jetbrains_skija_RuntimeEffect__1nMakeShader(JNIEnv* env,
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_org_jetbrains_skija_RuntimeEffect__1nMakeForShader(JNIEnv* env, jclass jclass, jstring sksl) {
+Java_org_jetbrains_skia_RuntimeEffect__1nMakeForShader(JNIEnv* env, jclass jclass, jstring sksl) {
     SkString skslProper = skString(env, sksl);
     SkRuntimeEffect::Result result = SkRuntimeEffect::MakeForShader(skslProper);
     if (result.errorText.isEmpty()) {
@@ -46,7 +46,7 @@ Java_org_jetbrains_skija_RuntimeEffect__1nMakeForShader(JNIEnv* env, jclass jcla
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_org_jetbrains_skija_RuntimeEffect__1nMakeForColorFilter(JNIEnv* env,
+Java_org_jetbrains_skia_RuntimeEffect__1nMakeForColorFilter(JNIEnv* env,
                                                              jclass jclass,
                                                              jstring sksl) {
     SkString skslProper = skString(env, sksl);

skiko/src/jvmMain/cpp/common/Shader.cc

@@ -5,7 +5,7 @@
 #include "SkGradientShader.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeWithColorFilter
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeWithColorFilter
   (JNIEnv* env, jclass jclass, jlong ptr, jlong filterPtr) {
     SkShader* instance = reinterpret_cast<SkShader*>(static_cast<uintptr_t>(ptr));
     SkColorFilter* filter = reinterpret_cast<SkColorFilter*>(static_cast<uintptr_t>(filterPtr));
@@ -13,7 +13,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeWithCo
     return reinterpret_cast<jlong>(newPtr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeLinearGradient
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeLinearGradient
   (JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jintArray colorsArray, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
     SkPoint pts[2] {SkPoint::Make(x0, y0), SkPoint::Make(x1, y1)};
     jint* colors = env->GetIntArrayElements(colorsArray, nullptr);
@@ -27,7 +27,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeLinear
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeLinearGradientCS
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeLinearGradientCS
   (JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jfloatArray colorsArray, jlong colorSpacePtr, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
     SkPoint pts[2] {SkPoint::Make(x0, y0), SkPoint::Make(x1, y1)};
     float* colors = env->GetFloatArrayElements(colorsArray, nullptr);
@@ -41,7 +41,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeLinear
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeRadialGradient
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeRadialGradient
   (JNIEnv* env, jclass jclass, jfloat x, jfloat y, jfloat r, jintArray colorsArray, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
     jint* colors = env->GetIntArrayElements(colorsArray, nullptr);
     float* pos = posArray == nullptr ? nullptr : env->GetFloatArrayElements(posArray, nullptr);
@@ -54,7 +54,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeRadial
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeRadialGradientCS
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeRadialGradientCS
   (JNIEnv* env, jclass jclass, jfloat x, jfloat y, jfloat r, jfloatArray colorsArray, jlong colorSpacePtr, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
     float* colors = env->GetFloatArrayElements(colorsArray, nullptr);
     sk_sp<SkColorSpace> colorSpace = sk_ref_sp<SkColorSpace>(reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr)));
@@ -67,7 +67,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeRadial
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeTwoPointConicalGradient
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradient
   (JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat r0, jfloat x1, jfloat y1, jfloat r1, jintArray colorsArray, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
     jint* colors = env->GetIntArrayElements(colorsArray, nullptr);
     float* pos = posArray == nullptr ? nullptr : env->GetFloatArrayElements(posArray, nullptr);
@@ -80,7 +80,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeTwoPoi
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeTwoPointConicalGradientCS
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradientCS
   (JNIEnv* env, jclass jclass, jfloat x0, jfloat y0, jfloat r0, jfloat x1, jfloat y1, jfloat r1, jfloatArray colorsArray, jlong colorSpacePtr, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
     float* colors = env->GetFloatArrayElements(colorsArray, nullptr);
     sk_sp<SkColorSpace> colorSpace = sk_ref_sp<SkColorSpace>(reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr)));
@@ -93,7 +93,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeTwoPoi
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeSweepGradient
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeSweepGradient
   (JNIEnv* env, jclass jclass, jfloat x, jfloat y, jfloat start, jfloat end, jintArray colorsArray, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
     jint* colors = env->GetIntArrayElements(colorsArray, nullptr);
     float* pos = posArray == nullptr ? nullptr : env->GetFloatArrayElements(posArray, nullptr);
@@ -106,7 +106,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeSweepG
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeSweepGradientCS
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeSweepGradientCS
   (JNIEnv* env, jclass jclass, jfloat x, jfloat y, jfloat start, jfloat end, jfloatArray colorsArray, jlong colorSpacePtr, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
     float* colors = env->GetFloatArrayElements(colorsArray, nullptr);
     sk_sp<SkColorSpace> colorSpace = sk_ref_sp<SkColorSpace>(reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr)));
@@ -119,23 +119,23 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeSweepG
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeEmpty(JNIEnv* env, jclass jclass) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeEmpty(JNIEnv* env, jclass jclass) {
     SkShader* ptr = SkShaders::Empty().release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeColor(JNIEnv* env, jclass jclass, jint color) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeColor(JNIEnv* env, jclass jclass, jint color) {
     SkShader* ptr = SkShaders::Color(color).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeColorCS(JNIEnv* env, jclass jclass, jfloat r, jfloat g, jfloat b, jfloat a, jlong colorSpacePtr) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeColorCS(JNIEnv* env, jclass jclass, jfloat r, jfloat g, jfloat b, jfloat a, jlong colorSpacePtr) {
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
     SkShader* ptr = SkShaders::Color(SkColor4f{r, g, b, a}, sk_ref_sp<SkColorSpace>(colorSpace)).release();
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Shader__1nMakeBlend(JNIEnv* env, jclass jclass, jint blendModeInt, jlong dstPtr, jlong srcPtr) {
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Shader__1nMakeBlend(JNIEnv* env, jclass jclass, jint blendModeInt, jlong dstPtr, jlong srcPtr) {
     SkShader* dst = reinterpret_cast<SkShader*>(static_cast<uintptr_t>(dstPtr));
     SkShader* src = reinterpret_cast<SkShader*>(static_cast<uintptr_t>(srcPtr));
     SkBlendMode blendMode = static_cast<SkBlendMode>(blendModeInt);

skiko/src/jvmMain/cpp/common/ShadowUtils.cc

@@ -2,7 +2,7 @@
 #include "SkShadowUtils.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_ShadowUtils__1nDrawShadow
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_ShadowUtils__1nDrawShadow
   (JNIEnv* env, jclass jclass, jlong canvasPtr, jlong pathPtr, jfloat zPlaneX, jfloat zPlaneY, jfloat zPlaneZ,
         jfloat lightPosX, jfloat lightPosY, jfloat lightPosZ, jfloat lightRadius, jint ambientColor, jint spotColor, jint flags) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
@@ -10,14 +10,14 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_ShadowUtils__1nDrawSh
     SkShadowUtils::DrawShadow(canvas, *path, {zPlaneX, zPlaneY, zPlaneZ}, {lightPosX, lightPosY, lightPosZ}, lightRadius, ambientColor, spotColor, flags);
 }
 
-extern "C" JNIEXPORT int JNICALL Java_org_jetbrains_skija_ShadowUtils__1nComputeTonalAmbientColor
+extern "C" JNIEXPORT int JNICALL Java_org_jetbrains_skia_ShadowUtils__1nComputeTonalAmbientColor
   (JNIEnv* env, jclass jclass, jint ambientColor, jint spotColor) {
     SkColor outAmbientColor, outSpotColor;
     SkShadowUtils::ComputeTonalColors(ambientColor, spotColor, &outAmbientColor, &outSpotColor);
     return outAmbientColor;
 }
 
-extern "C" JNIEXPORT int JNICALL Java_org_jetbrains_skija_ShadowUtils__1nComputeTonalSpotColor
+extern "C" JNIEXPORT int JNICALL Java_org_jetbrains_skia_ShadowUtils__1nComputeTonalSpotColor
   (JNIEnv* env, jclass jclass, jint ambientColor, jint spotColor) {
     SkColor outAmbientColor, outSpotColor;
     SkShadowUtils::ComputeTonalColors(ambientColor, spotColor, &outAmbientColor, &outSpotColor);

skiko/src/jvmMain/cpp/common/Surface.cc

@@ -4,7 +4,7 @@
 #include "SkSurface.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRasterDirect
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeRasterDirect
   (JNIEnv* env, jclass jclass,
     jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr,
     jlong pixelsPtr, jlong rowBytes,
@@ -26,7 +26,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRaste
     return reinterpret_cast<jlong>(instance.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRasterDirectWithPixmap
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeRasterDirectWithPixmap
   (JNIEnv* env, jclass jclass,
     jlong pixmapPtr, jobject surfacePropsObj)
 {
@@ -37,7 +37,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRaste
     return reinterpret_cast<jlong>(instance.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRaster
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeRaster
   (JNIEnv* env, jclass jclass,
     jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr,
     jlong rowBytes,
@@ -58,7 +58,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRaste
     return reinterpret_cast<jlong>(instance.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRasterN32Premul
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeRasterN32Premul
   (JNIEnv* env, jclass jclass, jint width, jint height) {
     sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(
         width, height,
@@ -67,7 +67,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRaste
     return reinterpret_cast<jlong>(surface.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeFromBackendRenderTarget
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeFromBackendRenderTarget
   (JNIEnv* env, jclass jclass, jlong pContext, jlong pBackendRenderTarget, jint surfaceOrigin, jint colorType, jlong colorSpacePtr, jobject surfacePropsObj) {
     GrDirectContext* context = reinterpret_cast<GrDirectContext*>(static_cast<uintptr_t>(pContext));
     GrBackendRenderTarget* backendRenderTarget = reinterpret_cast<GrBackendRenderTarget*>(static_cast<uintptr_t>(pBackendRenderTarget));
@@ -90,7 +90,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeFromB
 }
 
 #ifdef SK_METAL
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeFromMTKView
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeFromMTKView
   (JNIEnv* env, jclass jclass, jlong contextPtr, jlong mtkViewPtr, jint surfaceOrigin, jint sampleCount, jint colorType, jlong colorSpacePtr, jobject surfacePropsObj) {
     GrDirectContext* context = reinterpret_cast<GrDirectContext*>(static_cast<uintptr_t>(contextPtr));
     GrMTLHandle* mtkView = reinterpret_cast<GrMTLHandle*>(static_cast<uintptr_t>(mtkViewPtr));
@@ -111,7 +111,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeFromM
 }
 #endif
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRenderTarget
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeRenderTarget
   (JNIEnv* env, jclass jclass, jlong contextPtr, jboolean budgeted,
     jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr,
     jint sampleCount, jint surfaceOrigin,
@@ -136,95 +136,95 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeRende
     return reinterpret_cast<jlong>(instance.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeNull
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeNull
   (JNIEnv* env, jclass jclass, jint width, jint height) {
   sk_sp<SkSurface> instance = SkSurface::MakeNull(width, height);
   return reinterpret_cast<jlong>(instance.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nGetCanvas
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nGetCanvas
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(surface->getCanvas());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Surface__1nGetWidth
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Surface__1nGetWidth
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     return surface->width();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Surface__1nGetHeight
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Surface__1nGetHeight
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     return surface->height();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeImageSnapshot
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeImageSnapshot
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(surface->makeImageSnapshot().release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeImageSnapshotR
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeImageSnapshotR
   (JNIEnv* env, jclass jclass, jlong ptr, jint left, jint top, jint right, jint bottom) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(surface->makeImageSnapshot({left, top, right, bottom}).release());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Surface__1nGenerationId
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Surface__1nGenerationId
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     return surface->generationID();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Surface__1nReadPixelsToPixmap
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Surface__1nReadPixelsToPixmap
   (JNIEnv* env, jclass jclass, jlong ptr, jlong pixmapPtr, jint srcX, jint srcY) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     SkPixmap* pixmap = reinterpret_cast<SkPixmap*>(static_cast<uintptr_t>(pixmapPtr));
     return surface->readPixels(*pixmap, srcX, srcY);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Surface__1nReadPixels
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Surface__1nReadPixels
   (JNIEnv* env, jclass jclass, jlong ptr, jlong bitmapPtr, jint srcX, jint srcY) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(bitmapPtr));
     return surface->readPixels(*bitmap, srcX, srcY);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Surface__1nWritePixelsFromPixmap
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Surface__1nWritePixelsFromPixmap
   (JNIEnv* env, jclass jclass, jlong ptr, jlong pixmapPtr, jint x, jint y) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     SkPixmap* pixmap = reinterpret_cast<SkPixmap*>(static_cast<uintptr_t>(pixmapPtr));
     surface->writePixels(*pixmap, x, y);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Surface__1nWritePixels
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Surface__1nWritePixels
   (JNIEnv* env, jclass jclass, jlong ptr, jlong bitmapPtr, jint x, jint y) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     SkBitmap* bitmap = reinterpret_cast<SkBitmap*>(static_cast<uintptr_t>(bitmapPtr));
     surface->writePixels(*bitmap, x, y);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Surface__1nFlushAndSubmit
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Surface__1nFlushAndSubmit
   (JNIEnv* env, jclass jclass, jlong ptr, jboolean syncCpu) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     surface->flushAndSubmit(syncCpu);
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Surface__1nFlush
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Surface__1nFlush
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     surface->flush();
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Surface__1nUnique
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Surface__1nUnique
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     return surface->unique();
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Surface__1nGetImageInfo
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Surface__1nGetImageInfo
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     const SkImageInfo& info = surface->imageInfo();
@@ -236,14 +236,14 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Surface__1nGetImag
         reinterpret_cast<jlong>(info.refColorSpace().release()));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeSurface
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeSurface
   (JNIEnv* env, jclass jclass, jlong ptr, jint width, jint height) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     sk_sp<SkSurface> newSurface = surface->makeSurface(width, height);
     return reinterpret_cast<jlong>(newSurface.release());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeSurfaceI
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nMakeSurfaceI
   (JNIEnv* env, jclass jclass, jlong ptr, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     SkColorSpace* colorSpace = reinterpret_cast<SkColorSpace*>(static_cast<uintptr_t>(colorSpacePtr));
@@ -256,7 +256,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nMakeSurfa
     return reinterpret_cast<jlong>(newSurface.release());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Surface__1nDraw
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Surface__1nDraw
   (JNIEnv* env, jclass jclass, jlong ptr, jlong canvasPtr, jfloat x, jfloat y, jlong paintPtr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
@@ -264,20 +264,20 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Surface__1nDraw
     surface->draw(canvas, x, y, paint);
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Surface__1nPeekPixels
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Surface__1nPeekPixels
   (JNIEnv *env, jclass jclass, jlong ptr, jlong dstPixmapPtr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     SkPixmap* pixmap = reinterpret_cast<SkPixmap*>(static_cast<uintptr_t>(dstPixmapPtr));
     return static_cast<jboolean>(surface->peekPixels(pixmap));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_Surface__1nNotifyContentWillChange
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Surface__1nNotifyContentWillChange
   (JNIEnv* env, jclass jclass, jlong ptr, jint mode) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     surface->notifyContentWillChange(static_cast<SkSurface::ContentChangeMode>(mode));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Surface__1nGetRecordingContext
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Surface__1nGetRecordingContext
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkSurface* surface = reinterpret_cast<SkSurface*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(surface->recordingContext());

skiko/src/jvmMain/cpp/common/TextBlob.cc

@@ -10,25 +10,25 @@ static void unrefTextBlob(SkTextBlob* ptr) {
     ptr->unref();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlob__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&unrefTextBlob));
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_TextBlob__1nBounds
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_TextBlob__1nBounds
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkRect bounds = instance->bounds();
     return skija::Rect::fromSkRect(env, instance->bounds());
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_TextBlob__1nGetUniqueId
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_TextBlob__1nGetUniqueId
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     return instance->uniqueID();
 }
 
-extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextBlob__1nGetIntercepts
+extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skia_TextBlob__1nGetIntercepts
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat lower, jfloat upper, jlong paintPtr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     std::vector<float> bounds {lower, upper};
@@ -39,7 +39,7 @@ extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextBlob__1nGe
     return javaFloatArray(env, intervals);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nMakeFromPosH
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlob__1nMakeFromPosH
   (JNIEnv* env, jclass jclass, jshortArray glyphsArr, jfloatArray xposArr, jfloat ypos, jlong fontPtr) {
     jsize len = env->GetArrayLength(glyphsArr);
     jshort* glyphs = env->GetShortArrayElements(glyphsArr, nullptr);
@@ -54,7 +54,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nMakeFrom
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nMakeFromPos
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlob__1nMakeFromPos
   (JNIEnv* env, jclass jclass, jshortArray glyphsArr, jfloatArray posArr, jlong fontPtr ) {
     jsize len = env->GetArrayLength(glyphsArr);
     jshort* glyphs = env->GetShortArrayElements(glyphsArr, nullptr);
@@ -69,7 +69,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nMakeFrom
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nMakeFromRSXform
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlob__1nMakeFromRSXform
   (JNIEnv* env, jclass jclass, jshortArray glyphsArr, jfloatArray xformArr, jlong fontPtr ) {
     jsize len = env->GetArrayLength(glyphsArr);
     jshort* glyphs = env->GetShortArrayElements(glyphsArr, nullptr);
@@ -84,14 +84,14 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nMakeFrom
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nSerializeToData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlob__1nSerializeToData
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkData* data = instance->serialize({}).release();
     return reinterpret_cast<jlong>(data);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlob__1nMakeFromData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlob__1nMakeFromData
   (JNIEnv* env, jclass jclass, jlong dataPtr) {
     SkData* data = reinterpret_cast<SkData*>(static_cast<uintptr_t>(dataPtr));
     SkTextBlob* instance = SkTextBlob::Deserialize(data->data(), data->size(), {}).release();
@@ -162,7 +162,7 @@ public:
     }
 };
 
-extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_TextBlob__1nGetGlyphs
+extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skia_TextBlob__1nGetGlyphs
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkTextBlob::Iter iter(*instance);
@@ -177,7 +177,7 @@ extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_TextBlob__1nGe
     return javaShortArray(env, glyphs);
 }
 
-extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextBlob__1nGetPositions
+extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skia_TextBlob__1nGetPositions
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkTextBlob::Iter iter(*instance);
@@ -195,7 +195,7 @@ extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextBlob__1nGe
     return javaFloatArray(env, positions);
 }
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_TextBlob__1nGetClusters
+extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skia_TextBlob__1nGetClusters
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkTextBlob::Iter iter(*instance);
@@ -223,7 +223,7 @@ extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_TextBlob__1nGetC
     return javaIntArray(env, clusters);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_TextBlob__1nGetTightBounds
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_TextBlob__1nGetTightBounds
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkTextBlob::Iter iter(*instance);
@@ -244,7 +244,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_TextBlob__1nGetTig
     return skija::Rect::fromSkRect(env, bounds);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_TextBlob__1nGetBlockBounds
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_TextBlob__1nGetBlockBounds
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkTextBlob::Iter iter(*instance);
@@ -275,7 +275,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_TextBlob__1nGetBlo
     return skija::Rect::fromSkRect(env, bounds);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_TextBlob__1nGetFirstBaseline
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_TextBlob__1nGetFirstBaseline
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkTextBlob::Iter iter(*instance);
@@ -291,7 +291,7 @@ extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_TextBlob__1nGetFir
     return nullptr;
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_TextBlob__1nGetLastBaseline
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_TextBlob__1nGetLastBaseline
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlob* instance = reinterpret_cast<SkTextBlob*>(static_cast<uintptr_t>(ptr));
     SkTextBlob::Iter iter(*instance);

skiko/src/jvmMain/cpp/common/TextBlobBuilder.cc

@@ -7,23 +7,23 @@ static void deleteTextBlobBuilder(SkTextBlobBuilder* ptr) {
     delete ptr;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlobBuilder__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteTextBlobBuilder));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlobBuilder__1nMake
   (JNIEnv* env, jclass jclass) {
     return reinterpret_cast<jlong>(new SkTextBlobBuilder());
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nBuild
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextBlobBuilder__1nBuild
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTextBlobBuilder* instance = reinterpret_cast<SkTextBlobBuilder*>(static_cast<uintptr_t>(ptr));
     return reinterpret_cast<jlong>(instance->make().release());
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nAppendRun
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_TextBlobBuilder__1nAppendRun
   (JNIEnv* env, jclass jclass, jlong ptr, jlong fontPtr, jshortArray glyphsArr, jfloat x, jfloat y, jobject boundsObj) {
     SkTextBlobBuilder* instance = reinterpret_cast<SkTextBlobBuilder*>(static_cast<uintptr_t>(ptr));
     SkFont* font = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(fontPtr));
@@ -33,7 +33,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nAp
     env->GetShortArrayRegion(glyphsArr, 0, len, reinterpret_cast<jshort*>(run.glyphs));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nAppendRunPosH
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_TextBlobBuilder__1nAppendRunPosH
   (JNIEnv* env, jclass jclass, jlong ptr, jlong fontPtr, jshortArray glyphsArr, jfloatArray xsArr, jfloat y, jobject boundsObj) {
     SkTextBlobBuilder* instance = reinterpret_cast<SkTextBlobBuilder*>(static_cast<uintptr_t>(ptr));
     SkFont* font = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(fontPtr));
@@ -44,7 +44,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nAp
     env->GetFloatArrayRegion(xsArr, 0, len, reinterpret_cast<jfloat*>(run.pos));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nAppendRunPos
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_TextBlobBuilder__1nAppendRunPos
   (JNIEnv* env, jclass jclass, jlong ptr, jlong fontPtr, jshortArray glyphsArr, jfloatArray posArr, jobject boundsObj) {
     SkTextBlobBuilder* instance = reinterpret_cast<SkTextBlobBuilder*>(static_cast<uintptr_t>(ptr));
     SkFont* font = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(fontPtr));
@@ -55,7 +55,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nAp
     env->GetFloatArrayRegion(posArr, 0, len * 2, reinterpret_cast<jfloat*>(run.pos));
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_TextBlobBuilder__1nAppendRunRSXform
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_TextBlobBuilder__1nAppendRunRSXform
   (JNIEnv* env, jclass jclass, jlong ptr, jlong fontPtr, jshortArray glyphsArr, jfloatArray xformArr) {
     SkTextBlobBuilder* instance = reinterpret_cast<SkTextBlobBuilder*>(static_cast<uintptr_t>(ptr));
     SkFont* font = reinterpret_cast<SkFont*>(static_cast<uintptr_t>(fontPtr));

skiko/src/jvmMain/cpp/common/TextLine.cc

@@ -9,54 +9,54 @@ static void unrefTextLine(TextLine* ptr) {
     ptr->unref();
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextLine__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextLine__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&unrefTextLine));
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_TextLine__1nGetAscent
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_TextLine__1nGetAscent
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     return instance->fAscent;
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_TextLine__1nGetCapHeight
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_TextLine__1nGetCapHeight
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     return instance->fCapHeight;
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_TextLine__1nGetXHeight
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_TextLine__1nGetXHeight
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     return instance->fXHeight;
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_TextLine__1nGetDescent
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_TextLine__1nGetDescent
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     return instance->fDescent;
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_TextLine__1nGetLeading
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_TextLine__1nGetLeading
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     return instance->fLeading;
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_TextLine__1nGetWidth
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_TextLine__1nGetWidth
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     return instance->fWidth;
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_TextLine__1nGetHeight
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_TextLine__1nGetHeight
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     return -instance->fAscent + instance->fDescent + instance->fLeading;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextLine__1nGetTextBlob
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_TextLine__1nGetTextBlob
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     if (instance->fBlob == nullptr)
@@ -65,7 +65,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_TextLine__1nGetTextB
     return reinterpret_cast<jlong>(instance->fBlob.get());
 }
 
-extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_TextLine__1nGetGlyphs
+extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skia_TextLine__1nGetGlyphs
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     std::vector<jshort> glyphs(instance->fGlyphCount);
@@ -78,7 +78,7 @@ extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_TextLine__1nGe
     return javaShortArray(env, glyphs);
 }
 
-extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextLine__1nGetPositions
+extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skia_TextLine__1nGetPositions
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     std::vector<jfloat> positions(2 * instance->fGlyphCount);
@@ -91,7 +91,7 @@ extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextLine__1nGe
     return javaFloatArray(env, positions);
 }
 
-extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextLine__1nGetRunPositions
+extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skia_TextLine__1nGetRunPositions
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     std::vector<jfloat> positions(instance->fRuns.size());
@@ -100,7 +100,7 @@ extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextLine__1nGe
     return javaFloatArray(env, positions);
 }
 
-extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextLine__1nGetBreakPositions
+extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skia_TextLine__1nGetBreakPositions
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     std::vector<jfloat> positions;
@@ -109,7 +109,7 @@ extern "C" JNIEXPORT jfloatArray JNICALL Java_org_jetbrains_skija_TextLine__1nGe
     return javaFloatArray(env, positions);
 }
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_TextLine__1nGetBreakOffsets
+extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skia_TextLine__1nGetBreakOffsets
   (JNIEnv* env, jclass jclass, jlong ptr) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
     std::vector<jint> offsets;
@@ -118,7 +118,7 @@ extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_TextLine__1nGetB
     return javaIntArray(env, offsets);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_TextLine__1nGetOffsetAtCoord
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_TextLine__1nGetOffsetAtCoord
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat x) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
 
@@ -138,7 +138,7 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_TextLine__1nGetOffset
     return (jint) instance->fRuns.back().fBreakOffsets.back();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_TextLine__1nGetLeftOffsetAtCoord
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_TextLine__1nGetLeftOffsetAtCoord
   (JNIEnv* env, jclass jclass, jlong ptr, jfloat x) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
 
@@ -156,7 +156,7 @@ extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_TextLine__1nGetLeftOf
     return (jint) instance->fRuns.back().fBreakOffsets.back();
 }
 
-extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skija_TextLine__1nGetCoordAtOffset
+extern "C" JNIEXPORT jfloat JNICALL Java_org_jetbrains_skia_TextLine__1nGetCoordAtOffset
   (JNIEnv* env, jclass jclass, jlong ptr, jint offset16) {
     TextLine* instance = reinterpret_cast<TextLine*>(static_cast<uintptr_t>(ptr));
 

skiko/src/jvmMain/cpp/common/Typeface.cc

@@ -4,19 +4,19 @@
 #include "SkTypeface.h"
 #include "interop.hh"
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Typeface__1nGetFontStyle
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Typeface__1nGetFontStyle
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return skija::FontStyle::toJava(instance->fontStyle());
 }
 
-extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skija_Typeface__1nIsFixedPitch
+extern "C" JNIEXPORT jboolean JNICALL Java_org_jetbrains_skia_Typeface__1nIsFixedPitch
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return instance->isFixedPitch();
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Typeface__1nGetVariations
+extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skia_Typeface__1nGetVariations
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     int count = instance->getVariationDesignPosition(nullptr, 0);
@@ -33,7 +33,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Typeface__1nG
         return nullptr;
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Typeface__1nGetVariationAxes
+extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skia_Typeface__1nGetVariationAxes
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     int count = instance->getVariationDesignParameters(nullptr, 0);
@@ -50,20 +50,20 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Typeface__1nG
         return nullptr;
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Typeface__1nGetUniqueId
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Typeface__1nGetUniqueId
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return instance->uniqueID();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Typeface__1nEquals
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Typeface__1nEquals
   (JNIEnv* env, jclass jclass, jlong ptr, jlong otherPtr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     SkTypeface* other = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(otherPtr));
     return SkTypeface::Equal(instance, other);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeDefault
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Typeface__1nMakeDefault
   (JNIEnv* env, jclass jclass) {
     return reinterpret_cast<jlong>(SkTypeface::MakeDefault().release());
 }
@@ -89,7 +89,7 @@ sk_sp<SkTypeface> setDefaultVariationCoords(sk_sp<SkTypeface> face) {
     return face;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeFromName
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Typeface__1nMakeFromName
   (JNIEnv* env, jclass jclass, jstring nameStr, jint styleValue) {
     SkString name = skString(env, nameStr);
     SkFontStyle style = skija::FontStyle::fromJava(styleValue);
@@ -98,7 +98,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeFrom
     return reinterpret_cast<jlong>(ptr);
 }
     
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeFromFile
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Typeface__1nMakeFromFile
   (JNIEnv* env, jclass jclass, jstring pathStr, jint index) {
     SkString path = skString(env, pathStr);
     sk_sp<SkTypeface> instance = SkTypeface::MakeFromFile(path.c_str(), index);
@@ -106,7 +106,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeFrom
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeFromData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Typeface__1nMakeFromData
   (JNIEnv* env, jclass jclass, jlong dataPtr, jint index) {
     SkData* data = reinterpret_cast<SkData*>(static_cast<uintptr_t>(dataPtr));
     sk_sp<SkTypeface> instance = SkTypeface::MakeFromData(sk_ref_sp(data), index);
@@ -114,7 +114,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeFrom
     return reinterpret_cast<jlong>(ptr);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeClone
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Typeface__1nMakeClone
   (JNIEnv* env, jclass jclass, jlong typefacePtr, jobjectArray variations, jint collectionIndex) {
     SkTypeface* typeface = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(typefacePtr));
     int variationCount = env->GetArrayLength(variations);
@@ -134,7 +134,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nMakeClon
     return reinterpret_cast<jlong>(clone);
 }
 
-extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_Typeface__1nGetUTF32Glyphs
+extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skia_Typeface__1nGetUTF32Glyphs
   (JNIEnv* env, jclass jclass, jlong ptr, jintArray uniArr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     jint count = env->GetArrayLength(uniArr);
@@ -145,25 +145,25 @@ extern "C" JNIEXPORT jshortArray JNICALL Java_org_jetbrains_skija_Typeface__1nGe
     return javaShortArray(env, glyphs);
 }
 
-extern "C" JNIEXPORT jshort JNICALL Java_org_jetbrains_skija_Typeface__1nGetUTF32Glyph
+extern "C" JNIEXPORT jshort JNICALL Java_org_jetbrains_skia_Typeface__1nGetUTF32Glyph
   (JNIEnv* env, jclass jclass, jlong ptr, jint uni) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return instance->unicharToGlyph(uni);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Typeface__1nGetGlyphsCount
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Typeface__1nGetGlyphsCount
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return instance->countGlyphs();
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Typeface__1nGetTablesCount
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Typeface__1nGetTablesCount
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return instance->countTables();
 }
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_Typeface__1nGetTableTags
+extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skia_Typeface__1nGetTableTags
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     int count = instance->countTables();
@@ -172,26 +172,26 @@ extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_Typeface__1nGetT
     return javaIntArray(env, tags);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nGetTableSize
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Typeface__1nGetTableSize
   (JNIEnv* env, jclass jclass, jlong ptr, jint tag) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return instance->getTableSize(tag);
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_Typeface__1nGetTableData
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_Typeface__1nGetTableData
   (JNIEnv* env, jclass jclass, jlong ptr, jint tag) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     SkData* data = instance->copyTableData(tag).release();
     return reinterpret_cast<jlong>(data);
 }
 
-extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skija_Typeface__1nGetUnitsPerEm
+extern "C" JNIEXPORT jint JNICALL Java_org_jetbrains_skia_Typeface__1nGetUnitsPerEm
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return instance->getUnitsPerEm();
 }
 
-extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_Typeface__1nGetKerningPairAdjustments
+extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skia_Typeface__1nGetKerningPairAdjustments
   (JNIEnv* env, jclass jclass, jlong ptr, jshortArray glyphsArr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     int count = glyphsArr == nullptr ? 0 : env->GetArrayLength(glyphsArr);
@@ -209,7 +209,7 @@ extern "C" JNIEXPORT jintArray JNICALL Java_org_jetbrains_skija_Typeface__1nGetK
     }
 }
 
-extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Typeface__1nGetFamilyNames
+extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skia_Typeface__1nGetFamilyNames
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     SkTypeface::LocalizedStrings* iter = instance->createFamilyNameIterator();
@@ -229,7 +229,7 @@ extern "C" JNIEXPORT jobjectArray JNICALL Java_org_jetbrains_skija_Typeface__1nG
     return res;
 }
 
-extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skija_Typeface__1nGetFamilyName
+extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skia_Typeface__1nGetFamilyName
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     SkString name;
@@ -237,7 +237,7 @@ extern "C" JNIEXPORT jstring JNICALL Java_org_jetbrains_skija_Typeface__1nGetFam
     return javaString(env, name);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_Typeface__1nGetBounds
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_Typeface__1nGetBounds
   (JNIEnv* env, jclass jclass, jlong ptr) {
     SkTypeface* instance = reinterpret_cast<SkTypeface*>(static_cast<uintptr_t>(ptr));
     return skija::Rect::fromSkRect(env, instance->getBounds());

skiko/src/jvmMain/cpp/common/U16String.cc

@@ -7,12 +7,12 @@ static void deleteU16String(std::vector<jchar>* instance) {
     delete instance;
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_U16String__1nGetFinalizer
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_U16String__1nGetFinalizer
   (JNIEnv* env, jclass jclass) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(&deleteU16String));
 }
 
-extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_U16String__1nMake
+extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_U16String__1nMake
   (JNIEnv* env, jclass jclass, jstring str) {
     jsize len = env->GetStringLength(str);
     std::vector<jchar>* instance = new std::vector<jchar>(len);
@@ -20,7 +20,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_U16String__1nMake
     return reinterpret_cast<jlong>(instance);
 }
 
-extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_U16String__1nToString
+extern "C" JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_U16String__1nToString
   (JNIEnv* env, jclass jclass, jlong ptr) {
     std::vector<jchar>* instance = reinterpret_cast<std::vector<jchar>*>(static_cast<uintptr_t>(ptr));
     return env->NewString(instance->data(), instance->size());

skiko/src/jvmMain/cpp/common/impl/BufferUtil.cc

@@ -7,12 +7,12 @@ namespace {
 }
 
 extern "C" {
-    JNIEXPORT jobject JNICALL Java_org_jetbrains_skija_impl_BufferUtil__1nGetByteBufferFromPointer
+    JNIEXPORT jobject JNICALL Java_org_jetbrains_skia_impl_BufferUtil__1nGetByteBufferFromPointer
       (JNIEnv *env, jclass, jlong ptr, jint size) {
         return env->NewDirectByteBuffer(jlongToPtr<void*>(ptr), size);
     }
 
-    JNIEXPORT jlong JNICALL Java_org_jetbrains_skija_impl_BufferUtil__1nGetPointerFromByteBuffer
+    JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_impl_BufferUtil__1nGetPointerFromByteBuffer
       (JNIEnv *env, jclass, jobject buffer) {
         return ptrToJlong(env->GetDirectBufferAddress(buffer));
     }

skiko/src/jvmMain/cpp/common/impl/Library.cc

@@ -13,7 +13,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
     return JNI_VERSION_1_8;
 }
 
-extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skija_impl_Library__1nAfterLoad
+extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_impl_Library__1nAfterLoad
   (JNIEnv* env, jclass jclass) {
     env->EnsureLocalCapacity(64);
     java::onLoad(env);