diff --git a/java/org/libjpegturbo/turbojpeg/YUVImage.java b/java/org/libjpegturbo/turbojpeg/YUVImage.java
index bdb25d07..e66a5d13 100644
--- a/java/org/libjpegturbo/turbojpeg/YUVImage.java
+++ b/java/org/libjpegturbo/turbojpeg/YUVImage.java
@@ -222,13 +222,13 @@ public class YUVImage {
                      int height, int subsamp, boolean alloc) {
     if ((planes == null && !alloc) || width < 1 || height < 1 || subsamp < 0 ||
         subsamp >= TJ.NUMSAMP)
-      throw new IllegalArgumentException("Invalid argument in YUVImage::setBuf()");
+      throw new IllegalArgumentException("Invalid argument in YUVImage.setBuf()");
 
     int nc = (subsamp == TJ.SAMP_GRAY ? 1 : 3);
     if ((planes != null && planes.length != nc) ||
         (offsets != null && offsets.length != nc) ||
         (strides != null && strides.length != nc))
-      throw new IllegalArgumentException("YUVImage::setBuf(): planes, offsets, or strides array is the wrong size");
+      throw new IllegalArgumentException("YUVImage.setBuf(): planes, offsets, or strides array is the wrong size");
 
     if (planes == null)
       planes = new byte[nc][];
@@ -250,7 +250,7 @@ public class YUVImage {
         planes[i] = new byte[strides[i] * ph];
       }
       if (planes[i] == null || offsets[i] < 0)
-        throw new IllegalArgumentException("Invalid argument in YUVImage::setBuf()");
+        throw new IllegalArgumentException("Invalid argument in YUVImage.setBuf()");
       if (strides[i] < 0 && offsets[i] - planeSize + pw < 0)
         throw new IllegalArgumentException("Stride for plane " + i +
                                            " would cause memory to be accessed below plane boundary");
@@ -293,7 +293,7 @@ public class YUVImage {
     if (yuvImage == null || width < 1 || align < 1 ||
         ((align & (align - 1)) != 0) || height < 1 || subsamp < 0 ||
         subsamp >= TJ.NUMSAMP)
-      throw new IllegalArgumentException("Invalid argument in YUVImage::setBuf()");
+      throw new IllegalArgumentException("Invalid argument in YUVImage.setBuf()");
     if (yuvImage.length < TJ.bufSizeYUV(width, align, height, subsamp))
       throw new IllegalArgumentException("YUV buffer is not large enough");
 
diff --git a/turbojpeg-jni.c b/turbojpeg-jni.c
index 0a1d7451..5c6f6176 100644
--- a/turbojpeg-jni.c
+++ b/turbojpeg-jni.c
@@ -93,7 +93,7 @@
 
 #define PAD(v, p)  ((v + (p) - 1) & (~((p) - 1)))
 
-/* TurboJPEG 1.2.x: TJ::bufSize() */
+/* TurboJPEG 1.2.x: TJ.bufSize() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize
   (JNIEnv *env, jclass cls, jint width, jint height, jint jpegSubsamp)
 {
@@ -107,7 +107,7 @@ bailout:
   return (jint)retval;
 }
 
-/* TurboJPEG 1.4.x: TJ::bufSizeYUV() */
+/* TurboJPEG 1.4.x: TJ.bufSizeYUV() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV__IIII
   (JNIEnv *env, jclass cls, jint width, jint align, jint height, jint subsamp)
 {
@@ -121,7 +121,7 @@ bailout:
   return (jint)retval;
 }
 
-/* TurboJPEG 1.4.x: TJ::planeSizeYUV() */
+/* TurboJPEG 1.4.x: TJ.planeSizeYUV() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeSizeYUV__IIIII
   (JNIEnv *env, jclass cls, jint componentID, jint width, jint stride,
    jint height, jint subsamp)
@@ -136,7 +136,7 @@ bailout:
   return (jint)retval;
 }
 
-/* TurboJPEG 1.4.x: TJ::planeWidth() */
+/* TurboJPEG 1.4.x: TJ.planeWidth() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeWidth__III
   (JNIEnv *env, jclass cls, jint componentID, jint width, jint subsamp)
 {
@@ -148,7 +148,7 @@ bailout:
   return retval;
 }
 
-/* TurboJPEG 1.4.x: TJ::planeHeight() */
+/* TurboJPEG 1.4.x: TJ.planeHeight() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeHeight__III
   (JNIEnv *env, jclass cls, jint componentID, jint height, jint subsamp)
 {
@@ -160,7 +160,7 @@ bailout:
   return retval;
 }
 
-/* TurboJPEG 1.2.x: TJCompressor::init() */
+/* TurboJPEG 1.2.x: TJCompressor.init() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_init
   (JNIEnv *env, jobject obj)
 {
@@ -179,7 +179,7 @@ bailout:
   return;
 }
 
-/* TurboJPEG 3: TJCompressor::set() */
+/* TurboJPEG 3: TJCompressor.set() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_set
   (JNIEnv *env, jobject obj, jint param, jint value)
 {
@@ -194,7 +194,7 @@ bailout:
   return;
 }
 
-/* TurboJPEG 3: TJCompressor::get() */
+/* TurboJPEG 3: TJCompressor.get() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_get
   (JNIEnv *env, jobject obj, jint param)
 {
@@ -279,7 +279,7 @@ bailout:
   return (jint)jpegSize;
 }
 
-/* TurboJPEG 3: TJCompressor::compress8() byte source */
+/* TurboJPEG 3: TJCompressor.compress8() byte source */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress8___3BIIIIII_3B
   (JNIEnv *env, jobject obj, jbyteArray src, jint x, jint y, jint width,
    jint pitch, jint height, jint pf, jbyteArray dst)
@@ -288,7 +288,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress8___
                                pf, dst);
 }
 
-/* TurboJPEG 3: TJCompressor::compress12() */
+/* TurboJPEG 3: TJCompressor.compress12() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress12
   (JNIEnv *env, jobject obj, jshortArray src, jint x, jint y, jint width,
    jint pitch, jint height, jint pf, jbyteArray dst)
@@ -297,7 +297,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress12
                                height, pf, dst);
 }
 
-/* TurboJPEG 3: TJCompressor::compress16() */
+/* TurboJPEG 3: TJCompressor.compress16() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress16
   (JNIEnv *env, jobject obj, jshortArray src, jint x, jint y, jint width,
    jint pitch, jint height, jint pf, jbyteArray dst)
@@ -306,7 +306,7 @@ JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress16
                                height, pf, dst);
 }
 
-/* TurboJPEG 3: TJCompressor::compress8() int source */
+/* TurboJPEG 3: TJCompressor.compress8() int source */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress8___3IIIIIII_3B
   (JNIEnv *env, jobject obj, jintArray src, jint x, jint y, jint width,
    jint stride, jint height, jint pf, jbyteArray dst)
@@ -323,7 +323,7 @@ bailout:
   return 0;
 }
 
-/* TurboJPEG 3: TJCompressor::compressFromYUV8() */
+/* TurboJPEG 3: TJCompressor.compressFromYUV8() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compressFromYUV8
   (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
    jint width, jintArray jSrcStrides, jint height, jbyteArray dst)
@@ -504,7 +504,7 @@ bailout:
     SAFE_RELEASE(jDstPlanes[i], dstPlanesTmp[i]);
 }
 
-/* TurboJPEG 3: TJCompressor::encodeYUV8() byte source */
+/* TurboJPEG 3: TJCompressor.encodeYUV8() byte source */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV8___3BIIIIII_3_3B_3I_3I
   (JNIEnv *env, jobject obj, jbyteArray src, jint x, jint y, jint width,
    jint pitch, jint height, jint pf, jobjectArray dstobjs,
@@ -514,7 +514,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV8__
                           dstobjs, jDstOffsets, jDstStrides);
 }
 
-/* TurboJPEG 3: TJCompressor::encodeYUV8() int source */
+/* TurboJPEG 3: TJCompressor.encodeYUV8() int source */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV8___3IIIIIII_3_3B_3I_3I
   (JNIEnv *env, jobject obj, jintArray src, jint x, jint y, jint width,
    jint stride, jint height, jint pf, jobjectArray dstobjs,
@@ -533,7 +533,7 @@ bailout:
   return;
 }
 
-/* TurboJPEG 1.2.x: TJCompressor::destroy() */
+/* TurboJPEG 1.2.x: TJCompressor.destroy() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_destroy
   (JNIEnv *env, jobject obj)
 {
@@ -548,7 +548,7 @@ bailout:
   return;
 }
 
-/* TurboJPEG 1.2.x: TJDecompressor::init() */
+/* TurboJPEG 1.2.x: TJDecompressor.init() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_init
   (JNIEnv *env, jobject obj)
 {
@@ -567,21 +567,21 @@ bailout:
   return;
 }
 
-/* TurboJPEG 3: TJDecompressor::set() */
+/* TurboJPEG 3: TJDecompressor.set() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_set
   (JNIEnv *env, jobject obj, jint param, jint value)
 {
   Java_org_libjpegturbo_turbojpeg_TJCompressor_set(env, obj, param, value);
 }
 
-/* TurboJPEG 3: TJDecompressor::get() */
+/* TurboJPEG 3: TJDecompressor.get() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_get
   (JNIEnv *env, jobject obj, jint param)
 {
   return Java_org_libjpegturbo_turbojpeg_TJCompressor_get(env, obj, param);
 }
 
-/* TurboJPEG 1.2.x: TJDecompressor::getScalingFactors() */
+/* TurboJPEG 1.2.x: TJDecompressor.getScalingFactors() */
 JNIEXPORT jobjectArray JNICALL Java_org_libjpegturbo_turbojpeg_TJ_getScalingFactors
   (JNIEnv *env, jclass cls)
 {
@@ -612,7 +612,7 @@ bailout:
   return sfjava;
 }
 
-/* TurboJPEG 1.2.x: TJDecompressor::decompressHeader() */
+/* TurboJPEG 1.2.x: TJDecompressor.decompressHeader() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressHeader
   (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize)
 {
@@ -635,7 +635,7 @@ bailout:
   SAFE_RELEASE(src, jpegBuf);
 }
 
-/* TurboJPEG 3: TJDecompressor::setCroppingRegion() */
+/* TurboJPEG 3: TJDecompressor.setCroppingRegion() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_setCroppingRegion
   (JNIEnv *env, jobject obj)
 {
@@ -785,7 +785,7 @@ bailout:
   SAFE_RELEASE(src, jpegBuf);
 }
 
-/* TurboJPEG 3: TJDecompressor::decompress8() byte destination */
+/* TurboJPEG 3: TJDecompressor.decompress8() byte destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress8___3BI_3BIIII
   (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jbyteArray dst,
    jint x, jint y, jint pitch, jint pf)
@@ -794,7 +794,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress
                             pf);
 }
 
-/* TurboJPEG 3: TJDecompressor::decompress12() */
+/* TurboJPEG 3: TJDecompressor.decompress12() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress12
   (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jshortArray dst,
    jint x, jint y, jint pitch, jint pf)
@@ -803,7 +803,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress
                             pf);
 }
 
-/* TurboJPEG 3: TJDecompressor::decompress16() */
+/* TurboJPEG 3: TJDecompressor.decompress16() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress16
   (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jshortArray dst,
    jint x, jint y, jint pitch, jint pf)
@@ -812,7 +812,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress
                             pf);
 }
 
-/* TurboJPEG 3: TJDecompressor::decompress8() int destination */
+/* TurboJPEG 3: TJDecompressor.decompress8() int destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress8___3BI_3IIIII
   (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jintArray dst,
    jint x, jint y, jint stride, jint pf)
@@ -829,7 +829,7 @@ bailout:
   return;
 }
 
-/* TurboJPEG 3: TJDecompressor::decompressToYUV8() */
+/* TurboJPEG 3: TJDecompressor.decompressToYUV8() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressToYUV8
   (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize,
    jobjectArray dstobjs, jintArray jDstOffsets, jintArray jDstStrides)
@@ -1017,7 +1017,7 @@ bailout:
     SAFE_RELEASE(jSrcPlanes[i], srcPlanesTmp[i]);
 }
 
-/* TurboJPEG 3: TJDecompressor::decodeYUV8() byte destination */
+/* TurboJPEG 3: TJDecompressor.decodeYUV8() byte destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV8___3_3B_3I_3I_3BIIIIII
   (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
    jintArray jSrcStrides, jbyteArray dst, jint x, jint y, jint width,
@@ -1027,7 +1027,7 @@ JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV8
                             1, x, y, width, pitch, height, pf);
 }
 
-/* TurboJPEG 3: TJDecompressor::decodeYUV8() int destination */
+/* TurboJPEG 3: TJDecompressor.decodeYUV8() int destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV8___3_3B_3I_3I_3IIIIIII
   (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
    jintArray jSrcStrides, jintArray dst, jint x, jint y, jint width,
@@ -1046,7 +1046,7 @@ bailout:
   return;
 }
 
-/* TurboJPEG 1.2.x: TJTransformer::init() */
+/* TurboJPEG 1.2.x: TJTransformer.init() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_init
   (JNIEnv *env, jobject obj)
 {
@@ -1130,7 +1130,7 @@ bailout:
   return -1;
 }
 
-/* TurboJPEG 1.2.x: TJTransformer::transform() */
+/* TurboJPEG 1.2.x: TJTransformer.transform() */
 JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transform
   (JNIEnv *env, jobject obj, jbyteArray jsrcBuf, jint jpegSize,
    jobjectArray dstobjs, jobjectArray tobjs)
@@ -1262,7 +1262,7 @@ bailout:
   return jdstSizes;
 }
 
-/* TurboJPEG 1.2.x: TJDecompressor::destroy() */
+/* TurboJPEG 1.2.x: TJDecompressor.destroy() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy
   (JNIEnv *env, jobject obj)
 {