diff --git a/src/basic/Point.js b/src/basic/Point.js
index 8354c524..35018f34 100644
--- a/src/basic/Point.js
+++ b/src/basic/Point.js
@@ -73,14 +73,14 @@ var Point = this.Point = Base.extend({
 	 * The x coordinate of the point
 	 *
 	 * @name Point#x
-	 * @type number
+	 * @type Number
 	 */
 
 	/**
 	 * The y coordinate of the point
 	 * 
 	 * @name Point#y
-	 * @type number
+	 * @type Number
 	 */
 
 	set: function(x, y) {
@@ -327,7 +327,7 @@ var Point = this.Point = Base.extend({
 	 * ({@code x = 0}, {@code y = 0}) to the point's location.
 	 * Setting the length changes the location but keeps the vector's angle.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getLength: function() {
@@ -389,7 +389,7 @@ var Point = this.Point = Base.extend({
 	 * The angle is unsigned, no information about rotational direction is
 	 * given.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getAngle: function(/* point */) {
@@ -426,7 +426,7 @@ var Point = this.Point = Base.extend({
 	 * The angle is unsigned, no information about rotational direction is
 	 * given.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getAngleInRadians: function(/* point */) {
diff --git a/src/basic/Rectangle.js b/src/basic/Rectangle.js
index 875fc59e..a08cb96d 100644
--- a/src/basic/Rectangle.js
+++ b/src/basic/Rectangle.js
@@ -79,28 +79,28 @@ var Rectangle = this.Rectangle = Base.extend({
 	 * The x position of the rectangle.
 	 * 
 	 * @name Rectangle#x
-	 * @type number
+	 * @type Number
 	 */
 
 	/**
 	 * The y position of the rectangle.
 	 * 
 	 * @name Rectangle#y
-	 * @type number
+	 * @type Number
 	 */
 
 	/**
 	 * The width of the rectangle.
 	 * 
 	 * @name Rectangle#width
-	 * @type number
+	 * @type Number
 	 */
 
 	/**
 	 * The height of the rectangle.
 	 * 
 	 * @name Rectangle#height
-	 * @type number
+	 * @type Number
 	 */
 
 	// DOCS: why does jsdocs document this function, when there are no comments?
@@ -155,7 +155,7 @@ var Rectangle = this.Rectangle = Base.extend({
 	 * The position of the left hand side of the rectangle. Note that this
 	 * doesn't move the whole rectangle; the right hand side stays where it was.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getLeft: function() {
@@ -172,7 +172,7 @@ var Rectangle = this.Rectangle = Base.extend({
 	 * The top coordinate of the rectangle. Note that this doesn't move the
 	 * whole rectangle: the bottom won't move.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getTop: function() {
@@ -189,7 +189,7 @@ var Rectangle = this.Rectangle = Base.extend({
 	 * The position of the right hand side of the rectangle. Note that this
 	 * doesn't move the whole rectangle; the left hand side stays where it was.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getRight: function() {
@@ -205,7 +205,7 @@ var Rectangle = this.Rectangle = Base.extend({
 	 * The bottom coordinate of the rectangle. Note that this doesn't move the
 	 * whole rectangle: the top won't move.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getBottom: function() {
@@ -220,7 +220,7 @@ var Rectangle = this.Rectangle = Base.extend({
 	/**
 	 * The center-x coordinate of the rectangle.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 * @ignore
 	 */
@@ -236,7 +236,7 @@ var Rectangle = this.Rectangle = Base.extend({
 	/**
 	 * The center-y coordinate of the rectangle.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 * @ignore
 	 */
diff --git a/src/basic/Size.js b/src/basic/Size.js
index 1e95497b..5ad5b026 100644
--- a/src/basic/Size.js
+++ b/src/basic/Size.js
@@ -75,14 +75,14 @@ var Size = this.Size = Base.extend({
 	 * The width of the size
 	 *
 	 * @name Size#width
-	 * @type number
+	 * @type Number
 	 */
 
 	/**
 	 * The height of the size
 	 *
 	 * @name Size#height
-	 * @type number
+	 * @type Number
 	 */
 
 	set: function(width, height) {
diff --git a/src/color/GradientStop.js b/src/color/GradientStop.js
index 5a37d4c4..3ceace41 100644
--- a/src/color/GradientStop.js
+++ b/src/color/GradientStop.js
@@ -56,7 +56,7 @@ var GradientStop = this.GradientStop = Base.extend({
 	/**
 	 * The ramp-point of the gradient stop as a value between 0 and 1.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getRampPoint: function() {
diff --git a/src/item/Item.js b/src/item/Item.js
index 98715cd7..3143d762 100644
--- a/src/item/Item.js
+++ b/src/item/Item.js
@@ -51,7 +51,7 @@ var Item = this.Item = Base.extend({
 	/**
 	 * The unique id of the item.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getId: function() {
@@ -69,7 +69,7 @@ var Item = this.Item = Base.extend({
 	 * path.name = 'example';
 	 * project.activeLayer.children['example'].remove();
 	 * 
-	 * @type string
+	 * @type String
 	 * @bean
 	 */
 	getName: function() {
@@ -283,7 +283,7 @@ var Item = this.Item = Base.extend({
 	 * // Change the opacity of the circle to 50%:
 	 * circle.opacity = 0.5;
 	 * 
-	 * @type number
+	 * @type Number
 	 * @default 1
 	 */
 	opacity: 1,
@@ -412,7 +412,7 @@ var Item = this.Item = Base.extend({
 	/**
 	 * The index of this item within the list of its parent's children.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getIndex: function() {
@@ -803,7 +803,7 @@ var Item = this.Item = Base.extend({
 	 * 
 	 * @property
 	 * @name Item#strokeWidth
-	 * @type number
+	 * @type Number
 	 */
 
 	// DOCS: Item#strokeCap: describe the different options
@@ -819,7 +819,7 @@ var Item = this.Item = Base.extend({
 	 * 
 	 * @property
 	 * @name Item#strokeCap
-	 * @type string
+	 * @type String
 	 */
 
 	// DOCS: Item#strokeJoin: describe the different options
@@ -828,7 +828,7 @@ var Item = this.Item = Base.extend({
 	 * 
 	 * @property
 	 * @name Item#strokeJoin
-	 * @type string
+	 * @type String
 	 */
 
 	/**
@@ -836,7 +836,7 @@ var Item = this.Item = Base.extend({
 	 * 
 	 * @property
 	 * @name Item#dashOffset
-	 * @type number
+	 * @type Number
 	 */
 
 	/**
@@ -861,7 +861,7 @@ var Item = this.Item = Base.extend({
 	 * 
 	 * @property
 	 * @name Item#miterLimit
-	 * @type number
+	 * @type Number
 	 */
 
 	/**
diff --git a/src/item/PathStyle.js b/src/item/PathStyle.js
index 71316849..9062acf6 100644
--- a/src/item/PathStyle.js
+++ b/src/item/PathStyle.js
@@ -180,7 +180,7 @@ var PathStyle = this.PathStyle = Base.extend(new function() {
  * 
  * @property
  * @name PathStyle#strokeWidth
- * @type number
+ * @type Number
  */
 
 // DOCS: PathStyle#strokeCap: describe the different options
@@ -196,7 +196,7 @@ var PathStyle = this.PathStyle = Base.extend(new function() {
  * 
  * @property
  * @name PathStyle#strokeCap
- * @type string
+ * @type String
  */
 
 // DOCS: PathStyle#strokeJoin: describe the different options
@@ -205,7 +205,7 @@ var PathStyle = this.PathStyle = Base.extend(new function() {
  * 
  * @property
  * @name PathStyle#strokeJoin
- * @type string
+ * @type String
  */
 
 /**
@@ -213,7 +213,7 @@ var PathStyle = this.PathStyle = Base.extend(new function() {
  * 
  * @property
  * @name PathStyle#dashOffset
- * @type number
+ * @type Number
  */
 
 /**
@@ -238,7 +238,7 @@ var PathStyle = this.PathStyle = Base.extend(new function() {
  * 
  * @property
  * @name PathStyle#miterLimit
- * @type number
+ * @type Number
  */
 
 /**
diff --git a/src/item/Raster.js b/src/item/Raster.js
index dd18038c..6f815797 100644
--- a/src/item/Raster.js
+++ b/src/item/Raster.js
@@ -83,7 +83,7 @@ var Raster = this.Raster = Item.extend({
 	/**
 	 * The width of the raster in pixels.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getWidth: function() {
@@ -93,7 +93,7 @@ var Raster = this.Raster = Item.extend({
 	/**
 	 * The height of the raster in pixels.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getHeight: function() {
diff --git a/src/path/Curve.js b/src/path/Curve.js
index a17ed30f..78f2605f 100644
--- a/src/path/Curve.js
+++ b/src/path/Curve.js
@@ -146,7 +146,7 @@ var Curve = this.Curve = Base.extend({
 	/**
 	 * The index of the curve in the {@link Path#curves} array.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getIndex: function() {
@@ -211,7 +211,7 @@ var Curve = this.Curve = Base.extend({
 	/**
 	 * The approximated length of the curve in points.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getLength: function(/* from, to */) {
diff --git a/src/path/CurveLocation.js b/src/path/CurveLocation.js
index 58b70507..a0c5bc51 100644
--- a/src/path/CurveLocation.js
+++ b/src/path/CurveLocation.js
@@ -107,7 +107,7 @@ CurveLocation = Base.extend({
 	 * The length of the path from its beginning up to the location described
 	 * by this object.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getOffset: function() {
@@ -119,7 +119,7 @@ CurveLocation = Base.extend({
 	 * The length of the curve from its beginning up to the location described
 	 * by this object.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getCurveOffset: function() {
@@ -132,7 +132,7 @@ CurveLocation = Base.extend({
 	 * value between {@code 0} (beginning of the curve) and {@code 1} (end of
 	 * the curve).
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getParameter: function() {
diff --git a/src/path/Path.js b/src/path/Path.js
index 0f52853e..cd546e91 100644
--- a/src/path/Path.js
+++ b/src/path/Path.js
@@ -542,7 +542,7 @@ var Path = this.Path = PathItem.extend({
 	/**
 	 * The length of the perimeter of the path.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getLength: function() {
diff --git a/src/path/Segment.js b/src/path/Segment.js
index e3817657..eaa039b1 100644
--- a/src/path/Segment.js
+++ b/src/path/Segment.js
@@ -176,7 +176,7 @@ var Segment = this.Segment = Base.extend({
 	 * The index of the segment in the {@link Path#segments} array that the
 	 * segment belongs to.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getIndex: function() {
diff --git a/src/project/Project.js b/src/project/Project.js
index 189ab137..5937f81e 100644
--- a/src/project/Project.js
+++ b/src/project/Project.js
@@ -88,7 +88,7 @@ var Project = this.Project = Base.extend({
 	/**
 	 * The index of the project in the global projects array.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getIndex: function() {
diff --git a/src/text/CharacterStyle.js b/src/text/CharacterStyle.js
index a336186d..27f589c7 100644
--- a/src/text/CharacterStyle.js
+++ b/src/text/CharacterStyle.js
@@ -53,7 +53,7 @@ var CharacterStyle = this.CharacterStyle = PathStyle.extend({
 	 *
 	 * @name CharacterStyle#font
 	 * @default 'sans-serif'
-	 * @type string
+	 * @type String
 	 */
 
 	/**
@@ -61,7 +61,7 @@ var CharacterStyle = this.CharacterStyle = PathStyle.extend({
 	 *
 	 * @name CharacterStyle#fontSize
 	 * @default 10
-	 * @type number
+	 * @type Number
 	 */
 
 	statics: {
diff --git a/src/text/TextItem.js b/src/text/TextItem.js
index 8909c609..7901fe6f 100644
--- a/src/text/TextItem.js
+++ b/src/text/TextItem.js
@@ -43,7 +43,7 @@ var TextItem = this.TextItem = Item.extend({
 	 * The text contents of the text item.
 	 *
 	 * @name TextItem#content
-	 * @type string
+	 * @type String
 	 */
 
 	_clone: function(copy) {
diff --git a/src/tool/Tool.js b/src/tool/Tool.js
index 2a53ba64..8509b043 100644
--- a/src/tool/Tool.js
+++ b/src/tool/Tool.js
@@ -70,7 +70,7 @@ var Tool = this.Tool = Base.extend({
 	 * {@link #onMouseDrag} event is called repeatedly after the initial
 	 * {@link #onMouseDown} until the user releases the mouse.
 	 * 
-	 * @type number
+	 * @type Number
 	 */
 	eventInterval: null,
 
@@ -78,7 +78,7 @@ var Tool = this.Tool = Base.extend({
 	 * The minimum distance the mouse has to drag before firing the onMouseDrag
 	 * event, since the last onMouseDrag event.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getMinDistance: function() {
@@ -97,7 +97,7 @@ var Tool = this.Tool = Base.extend({
 	 * The maximum distance the mouse has to drag before firing the onMouseDrag
 	 * event, since the last onMouseDrag event.
 	 * 
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getMaxDistance: function() {
@@ -114,7 +114,7 @@ var Tool = this.Tool = Base.extend({
 
 	// DOCS: document Tool#fixedDistance
 	/**
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getFixedDistance: function() {
diff --git a/src/tool/ToolEvent.js b/src/tool/ToolEvent.js
index f4078c40..bc1d1fce 100644
--- a/src/tool/ToolEvent.js
+++ b/src/tool/ToolEvent.js
@@ -147,7 +147,7 @@ var ToolEvent = this.ToolEvent = Base.extend({
 	/**
 	 * The number of times the mouse event was fired.
 	 *
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getCount: function() {
diff --git a/src/ui/KeyEvent.js b/src/ui/KeyEvent.js
index e01cabc7..c257217b 100644
--- a/src/ui/KeyEvent.js
+++ b/src/ui/KeyEvent.js
@@ -47,14 +47,14 @@ var KeyEvent = this.KeyEvent = Event.extend(new function() {
 		 * The string character of the key that caused this key event.
 		 * 
 		 * @name KeyEvent#character
-		 * @type string
+		 * @type String
 		 */
 
 		/**
 		 * The key that caused this key event.
 		 * 
 		 * @name KeyEvent#key
-		 * @type string
+		 * @type String
 		 */
 
 		/**
diff --git a/src/ui/View.js b/src/ui/View.js
index 3a7d7c27..76ec835a 100644
--- a/src/ui/View.js
+++ b/src/ui/View.js
@@ -172,7 +172,7 @@ var View = this.View = Base.extend({
 	},
 
 	/**
-	 * @type number
+	 * @type Number
 	 * @bean
 	 */
 	getZoom: function() {