diff --git a/coresdk/src/coresdk/images.h b/coresdk/src/coresdk/images.h
index 35f8397b..a5c1c8f1 100644
--- a/coresdk/src/coresdk/images.h
+++ b/coresdk/src/coresdk/images.h
@@ -179,7 +179,6 @@ namespace splashkit_lib
      * @attribute class   bitmap
      * @attribute method  draw_bitmap
      * @attribute self    bmp
-     * @attribute suffix  on_bitmap
      */
     void draw_bitmap_on_bitmap(bitmap destination, bitmap bmp, double x, double y);
 
@@ -199,7 +198,7 @@ namespace splashkit_lib
      * @attribute class   bitmap
      * @attribute method  draw_bitmap
      * @attribute self    bmp
-     * @attribute suffix  on_bitmap_with_options
+     * @attribute suffix  with_options
      */
     void draw_bitmap_on_bitmap(bitmap destination, bitmap bmp, double x, double y, drawing_options opts);
 
@@ -584,8 +583,10 @@ namespace splashkit_lib
      * @param y     The y coordinate within the bitmap to check
      * @returns     True if the pixel at that point in the bitmap is drawn.
      *
-     * @attribute class bitmap
-     * @attribute method pixel_drawn_at_point
+     * 
+     * @attribute class   bitmap
+     * @attribute method  pixel_drawn_at_point
+     * @attribute self    bmp
      */
     bool pixel_drawn_at_point(bitmap bmp, double x, double y);
 
@@ -599,10 +600,11 @@ namespace splashkit_lib
      * @returns     True if the pixel at that point in the bitmap's cell is
      *              drawn.
      *
+     * 
+     * @attribute class   bitmap
+     * @attribute method  pixel_drawn_at_point
      * @attribute suffix  in_cell
-     *
-     * @attribute class bitmap
-     * @attribute method pixel_drawn_at_point
+     * @attribute self    bmp
      */
     bool pixel_drawn_at_point(bitmap bmp, int cell, double x, double y);
 
@@ -613,10 +615,11 @@ namespace splashkit_lib
      * @param pt    The point within the bitmap to check.
      * @returns     True if the pixel at that point in the bitmap is drawn.
      *
+     * 
+     * @attribute class   bitmap
+     * @attribute method  pixel_drawn_at_point
      * @attribute suffix  pt
-     *
-     * @attribute class bitmap
-     * @attribute method pixel_drawn_at_point
+     * @attribute self    bmp
      */
     bool pixel_drawn_at_point(bitmap bmp, const point_2d &pt);
 
@@ -629,10 +632,11 @@ namespace splashkit_lib
      * @returns     True if the pixel at that point in the bitmap's cell is
      *              drawn.
      *
-     * @attribute suffix  in_cell_pt
      *
-     * @attribute class bitmap
-     * @attribute method pixel_drawn_at_point_in_cell
+     * @attribute class   bitmap
+     * @attribute method  pixel_drawn_at_point
+     * @attribute suffix  in_cell_pt
+     * @attribute self    bmp
      */
     bool pixel_drawn_at_point(bitmap bmp, int cell, const point_2d &pt);
 }
diff --git a/coresdk/src/coresdk/interface.h b/coresdk/src/coresdk/interface.h
index 7683e5fc..65cd49b6 100644
--- a/coresdk/src/coresdk/interface.h
+++ b/coresdk/src/coresdk/interface.h
@@ -39,7 +39,7 @@ namespace splashkit_lib
      *
      * @param fnt               The name of the font to be used
      *
-     * @attribute suffix        font_as_string
+     * @attribute suffix        with_string
      */
     void set_interface_font(const string& fnt);
 
diff --git a/coresdk/src/coresdk/quad_geometry.h b/coresdk/src/coresdk/quad_geometry.h
index e9412d91..a6ab4c68 100644
--- a/coresdk/src/coresdk/quad_geometry.h
+++ b/coresdk/src/coresdk/quad_geometry.h
@@ -83,7 +83,7 @@ namespace splashkit_lib
      * @param width          The width of the quad
      * @return               A quad that represents the line with the given width
      * 
-     * @attribute suffix  from_line
+     * @attribute suffix  line
      */
     quad quad_from(const point_2d& line_origin, const point_2d& line_end, double width);
 
diff --git a/coresdk/src/coresdk/sprites.h b/coresdk/src/coresdk/sprites.h
index b6fecbcc..08a63f6a 100644
--- a/coresdk/src/coresdk/sprites.h
+++ b/coresdk/src/coresdk/sprites.h
@@ -953,9 +953,9 @@ namespace splashkit_lib
      * @param pt  The point that is at the end of the vector.
      * @returns   A vector pointing from the sprite to the point.
      *
-     * @attribute class sprite
-     * @attribute method vector_to
-     * @attribute suffix point
+     * @attribute class   sprite
+     * @attribute method  vector_from_center_to_point
+     * @attribute self    s
      */
     vector_2d vector_from_center_sprite_to_point(sprite s, const point_2d &pt);