 	###########################################################################
 	# CONTENT ZOOM
 
-	@define "contentZoom",
-		get: -> @_contentZoom
-		set: (contentZoom) -> @setContentZoom(contentZoom, false)
-	
-	setContentZoom: (contentZoom, animate=false) ->
-		
-		contentZoom = parseFloat(contentZoom)
-	
-		if contentZoom is @_contentZoom
-			return
-		
-		@_contentZoom = contentZoom
+	@define "contentScale",
+		get: -> @_contentScale
+		set: (contentScale) -> @setContentScale(contentScale, false)
+	
+	setContentScale: (contentScale, animate=false) ->
+		
+		contentScale = parseFloat(contentScale)
+	
+		if contentScale is @_contentScale
+			return
+		
+		@_contentScale = contentScale
 		
 		if animate
 			@content.animate _.extend @animationOptions,
-				properties: {scale: @_contentZoom}
-		else
-			@content.scale = @_contentZoom
-
-		@emit("change:contentZoom")
+				properties: {scale: @_contentScale}
+		else
+			@content.scale = @_contentScale
+
+		@emit("change:contentScale")
 
 
 	###########################################################################

			@phone.scale = phoneScale
			@phone.center()

		@emit("change:deviceZoom")
			

	_calculatePhoneScale: ->
		
		# Calculates a phone scale that fits the screen unless a fixed value is set
		
		if @_deviceZoom and @_deviceZoom isnt "fit"
			return @_deviceZoom

		[width, height] = @_getOrientationDimensions(@phone.width, @phone.height)


	###########################################################################
	# DEVICE ZOOM
	
	@define "deviceScale",
		get: -> @_deviceScale
		set: (deviceScale) -> @setDeviceScale(deviceScale, false)
	
	setDeviceScale: (deviceScale, animate=false) ->
		
		if deviceScale == "fit" or deviceScale < 0
			deviceScale = "fit"
		else
			deviceScale = parseFloat(deviceScale)
			
		if deviceScale == @_deviceScale
			return

		@_deviceScale = deviceScale
		
		if deviceScale == "fit"
			phoneScale = @_calculatePhoneScale()
		else
			phoneScale = deviceScale
			
		@phone.animateStop()

