From 00a024f7c3969ab51cdac315aefc2d9f7edd7d60 Mon Sep 17 00:00:00 2001
From: Kyle McDonald <kyle@kylemcdonald.net>
Date: Mon, 12 Aug 2013 10:44:58 +0900
Subject: [PATCH] renamed all instances of testApp to ofApp

---
 apps/projectGenerator/projectGeneratorSimple  |  2 +-
 examples/3d/3DPrimitivesExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/3d/advanced3dExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../3d/cameraLensOffsetExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../3d/cameraParentingExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/3d/cameraRibbonExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/3d/easyCamExample/src/main.cpp       |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../easyCamExample/src/{testApp.h => ofApp.h} |  2 +-
 examples/3d/meshFromCamera/src/main.cpp       |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../meshFromCamera/src/{testApp.h => ofApp.h} |  2 +-
 examples/3d/modelNoiseExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 30 +++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/3d/normalsExample/src/main.cpp       |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../normalsExample/src/{testApp.h => ofApp.h} |  2 +-
 examples/3d/ofBoxExample/src/main.cpp         |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../ofBoxExample/src/{testApp.h => ofApp.h}   |  2 +-
 examples/3d/orientationExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/3d/pointCloudExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/3d/pointPickerExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../3d/quaternionArcballExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../3d/quaternionLatLongExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../addons/3DModelLoaderExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/addons/allAddonsExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/addons/assimpExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../assimpExample/src/{testApp.h => ofApp.h}  |  2 +-
 examples/addons/kinectExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 22 ++++----
 .../kinectExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../networkTcpClientExample/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../networkTcpServerExample/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../networkUdpReceiverExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../networkUdpSenderExample/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/addons/opencvExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../opencvExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../opencvHaarFinderExample/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../addons/oscChatSystemExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 30 +++++------
 .../src/{testApp.h => ofApp.h}                |  4 +-
 .../addons/oscReceiveExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/addons/oscSenderExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/addons/svgExample/src/main.cpp       |  4 +-
 .../svgExample/src/{testApp.cpp => ofApp.cpp} | 26 ++++-----
 .../svgExample/src/{testApp.h => ofApp.h}     |  2 +-
 .../threadedImageLoaderExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../addons/vectorGraphicsExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../addons/xmlSettingsExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android3DModelLoaderExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../androidAccelerometerExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../androidAdvanced3DExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 46 ++++++++--------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidAssimpExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidAudioExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 44 +++++++--------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidCameraExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidEmptyExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidFontExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidGuiExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 38 ++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidImageExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidOpenCVExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../androidOpenCVFaceExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../androidPolygonExample/src/main.cpp        |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidShaderExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../androidSoundPlayerExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidSwipeExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 34 ++++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidTouchExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidVBOExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../androidVibratorExample/src/main.cpp       |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../android/androidVideoExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../communication/firmataExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 42 +++++++--------
 .../firmataExample/src/{testApp.h => ofApp.h} |  2 +-
 .../communication/serialExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../serialExample/src/{testApp.h => ofApp.h}  |  2 +-
 examples/empty/emptyExample/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../emptyExample/src/{testApp.h => ofApp.h}   |  2 +-
 .../events/advancedEventsExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 34 ++++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../events/customEventExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 34 ++++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/events/eventsExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../eventsExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../events/simpleEventsExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 16 +++---
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/events/simpleTimer/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../simpleTimer/src/{testApp.h => ofApp.h}    |  2 +-
 .../gl/alphaMaskingShaderExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/billboardExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../gl/billboardRotationExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/fboTrailsExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 30 +++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../gl/geometryShaderExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/glInfoExample/src/main.cpp        |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../glInfoExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../gl/gpuParticleSystemExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/multiLightExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../gl/multiTextureShaderExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/pointsAsTextures/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/shaderExample/src/main.cpp        |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../shaderExample/src/{testApp.h => ofApp.h}  |  2 +-
 examples/gl/singleLightExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/slowFastRendering/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/textureExample/src/main.cpp       |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../textureExample/src/{testApp.h => ofApp.h} |  2 +-
 .../gl/textureScreengrabExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gl/vboExample/src/main.cpp           |  4 +-
 .../vboExample/src/{testApp.cpp => ofApp.cpp} | 36 ++++++-------
 .../gl/vboExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../bin/data/shaders/instanced.vert           |  2 +-
 .../bin/data/shaders/instanced_120.vert       |  2 +-
 .../vboMeshDrawInstancedExample/src/main.cpp  |  8 +--
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  4 +-
 examples/gl/viewportExample/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 32 +++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../gles/customEGLWindowSettings/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 48 ++++++++---------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../graphics/blendingExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/graphics/color/src/main.cpp          |  4 +-
 .../color/src/{testApp.cpp => ofApp.cpp}      | 26 ++++-----
 .../graphics/color/src/{testApp.h => ofApp.h} |  2 +-
 examples/graphics/colorsExtended/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../colorsExtended/src/{testApp.h => ofApp.h} |  2 +-
 .../floatingPointImageExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 32 +++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../graphics/fontShapesExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/graphics/fontsExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../fontsExample/src/{testApp.h => ofApp.h}   |  2 +-
 .../graphics/graphicsExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../imageCompressionExample/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../graphics/imageLoaderExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../imageLoaderWebExample/src/main.cpp        |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 30 +++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../graphics/imageSaverExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../imageSequenceExample/src/main.cpp         |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../imageSubsectionExample/src/main.cpp       |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../graphics/lutFilterExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 24 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/graphics/pdfExample/src/main.cpp     |  4 +-
 .../pdfExample/src/{testApp.cpp => ofApp.cpp} | 26 ++++-----
 .../pdfExample/src/{testApp.h => ofApp.h}     |  2 +-
 examples/graphics/polygonExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../polygonExample/src/{testApp.h => ofApp.h} |  2 +-
 .../polylineBlobsExample/src/main.cpp         |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../rectangleAlignmentAndScaling/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 36 ++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/graphics/simpleColorKey/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../simpleColorKey/src/{testApp.h => ofApp.h} |  2 +-
 examples/gui/guiExample/src/main.cpp          |  4 +-
 .../guiExample/src/{testApp.cpp => ofApp.cpp} | 38 ++++++-------
 .../gui/guiExample/src/{testApp.h => ofApp.h} |  2 +-
 .../gui/guiFromParametersExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 38 ++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../gui/oscParametersReceiver/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/gui/oscParametersSender/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../parameterEdgeCasesExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 32 +++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../gui/parameterGroupExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/ios/3DPrimitivesExample/src/main.mm  |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/CoreLocationExample/src/main.mm  |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/ImagePickerExample/src/main.mm   |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/KeyboardExample/src/main.mm      |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/MapKitExample/src/main.mm        |  4 +-
 .../MapKitExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 52 +++++++++---------
 examples/ios/TouchAndAccelExample/src/main.mm |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 30 +++++------
 .../ios/advancedEventsExample/src/main.mm     |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 36 ++++++-------
 examples/ios/advancedGraphics/src/main.mm     |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/assimpExample/src/main.mm        |  4 +-
 .../assimpExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 30 +++++------
 examples/ios/audioInputExample/src/main.mm    |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 30 +++++------
 examples/ios/audioOutputExample/src/main.mm   |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 30 +++++------
 examples/ios/dirListExample/src/main.mm       |  4 +-
 .../dirListExample/src/{testApp.h => ofApp.h} |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/emptyExample/src/main.mm         |  4 +-
 .../testApp.h => emptyExample/src/ofApp.h}    |  2 +-
 .../emptyExample/src/{testApp.mm => ofApp.mm} | 28 +++++-----
 examples/ios/eventsExample/src/main.mm        |  4 +-
 .../eventsExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/fontShapesExample/src/main.mm    |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/fontsExample/src/main.mm         |  4 +-
 .../fontsExample/src/{testApp.h => ofApp.h}   |  2 +-
 .../fontsExample/src/{testApp.mm => ofApp.mm} | 28 +++++-----
 examples/ios/graphicsExample/src/main.mm      |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 .../ios/iPhoneGuiExample/src/gui/MyGuiView.h  |  4 +-
 .../ios/iPhoneGuiExample/src/gui/MyGuiView.mm |  2 +-
 examples/ios/iPhoneGuiExample/src/main.mm     |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/imageLoaderExample/src/main.mm   |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 .../src/UI/MyAppViewController.mm             | 10 ++--
 examples/ios/iosCustomSizeExample/src/main.mm |  4 +-
 .../src/ofApp.h}                              |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/iosES2ShaderExample/src/main.mm  |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 .../src/UI/AlertViewDelegate.mm               |  4 +-
 .../ios/iosExternalDisplayExample/src/main.mm |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 42 +++++++--------
 .../src/ofApp.h}                              |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 30 +++++------
 .../src/ActionSheetDelegateForOF.h            |  6 +--
 .../src/ActionSheetDelegateForOF.mm           |  2 +-
 .../ios/iosOrientationExample/src/main.mm     |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 40 +++++++-------
 .../src/VideoPlayerControlsDelegateForOF.h    |  6 +--
 .../src/VideoPlayerControlsDelegateForOF.mm   |  2 +-
 examples/ios/moviePlayerExample/src/main.mm   |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 54 +++++++++----------
 examples/ios/ofxGuiExample/src/main.mm        |  4 +-
 .../ofxGuiExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 38 ++++++-------
 examples/ios/opencvExample/src/main.mm        |  4 +-
 .../opencvExample/src/{testApp.h => ofApp.h}  |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/opencvFaceExample/src/main.mm    |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/oscReceiverExample/src/main.mm   |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/oscSenderExample/src/main.mm     |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/polygonExample/src/main.mm       |  4 +-
 .../polygonExample/src/{testApp.h => ofApp.h} |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/soundPlayerExample/src/main.mm   |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/textureExample/src/main.mm       |  4 +-
 .../textureExample/src/{testApp.h => ofApp.h} |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/vboExample/src/main.mm           |  4 +-
 .../ios/vboExample/src/{testApp.h => ofApp.h} |  2 +-
 .../vboExample/src/{testApp.mm => ofApp.mm}   | 28 +++++-----
 examples/ios/videoGrabberExample/src/main.mm  |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/ios/xmlSettingsExample/src/main.mm   |  4 +-
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../src/{testApp.mm => ofApp.mm}              | 28 +++++-----
 examples/math/noise1dExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 40 +++++++-------
 .../noise1dExample/src/{testApp.h => ofApp.h} |  2 +-
 .../math/noise1dOctaveExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 36 ++++++-------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../math/noiseField2dExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../particlesExample/src/demoParticle.cpp     |  2 +-
 examples/math/particlesExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../math/periodicSignalsExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../trigonometricMotionExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../math/trigonometryExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/math/vectorMathExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/sound/audioInputExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../sound/audioOutputExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../sound/soundPlayerExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../sound/soundPlayerFFTExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/utils/conversionExample/src/main.cpp |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/utils/dirListExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../dirListExample/src/{testApp.h => ofApp.h} |  2 +-
 examples/utils/dragDropExample/src/main.cpp   |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../fileBufferLoadingCSVExample/src/main.cpp  |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../fileOpenSaveDialogExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../utils/loadTextFileExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/utils/loggingExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../loggingExample/src/{testApp.h => ofApp.h} |  2 +-
 .../regularExpressionExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 28 +++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/utils/sortingExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 36 ++++++-------
 .../sortingExample/src/{testApp.h => ofApp.h} |  2 +-
 .../utils/systemSpeakExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 30 +++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 examples/utils/threadExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../threadExample/src/{testApp.h => ofApp.h}  |  2 +-
 examples/utils/windowExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../windowExample/src/{testApp.h => ofApp.h}  |  2 +-
 examples/utils/xmlExample/src/main.cpp        |  4 +-
 .../xmlExample/src/{testApp.cpp => ofApp.cpp} | 26 ++++-----
 .../xmlExample/src/{testApp.h => ofApp.h}     |  2 +-
 examples/video/asciiVideo/src/main.cpp        |  4 +-
 .../asciiVideo/src/{testApp.cpp => ofApp.cpp} | 26 ++++-----
 .../asciiVideo/src/{testApp.h => ofApp.h}     |  2 +-
 .../src/main.cpp                              |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../osxVideoRecorderExample/src/main.cpp      |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 30 +++++------
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../video/videoGrabberExample/src/main.cpp    |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 .../video/videoPlayerExample/src/main.cpp     |  4 +-
 .../src/{testApp.cpp => ofApp.cpp}            | 26 ++++-----
 .../src/{testApp.h => ofApp.h}                |  2 +-
 521 files changed, 3068 insertions(+), 3068 deletions(-)
 rename examples/3d/3DPrimitivesExample/src/{testApp.cpp => ofApp.cpp} (97%)
 rename examples/3d/3DPrimitivesExample/src/{testApp.h => ofApp.h} (97%)
 rename examples/3d/advanced3dExample/src/{testApp.cpp => ofApp.cpp} (93%)
 rename examples/3d/advanced3dExample/src/{testApp.h => ofApp.h} (97%)
 rename examples/3d/cameraLensOffsetExample/src/{testApp.cpp => ofApp.cpp} (88%)
 rename examples/3d/cameraLensOffsetExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/3d/cameraParentingExample/src/{testApp.cpp => ofApp.cpp} (93%)
 rename examples/3d/cameraParentingExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/3d/cameraRibbonExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/3d/cameraRibbonExample/src/{testApp.h => ofApp.h} (97%)
 rename examples/3d/easyCamExample/src/{testApp.cpp => ofApp.cpp} (84%)
 rename examples/3d/easyCamExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/3d/meshFromCamera/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/3d/meshFromCamera/src/{testApp.h => ofApp.h} (96%)
 rename examples/3d/modelNoiseExample/src/{testApp.cpp => ofApp.cpp} (86%)
 rename examples/3d/modelNoiseExample/src/{testApp.h => ofApp.h} (97%)
 rename examples/3d/normalsExample/src/{testApp.cpp => ofApp.cpp} (91%)
 rename examples/3d/normalsExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/3d/ofBoxExample/src/{testApp.cpp => ofApp.cpp} (81%)
 rename examples/3d/ofBoxExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/3d/orientationExample/src/{testApp.cpp => ofApp.cpp} (86%)
 rename examples/3d/orientationExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/3d/pointCloudExample/src/{testApp.cpp => ofApp.cpp} (79%)
 rename examples/3d/pointCloudExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/3d/pointPickerExample/src/{testApp.cpp => ofApp.cpp} (78%)
 rename examples/3d/pointPickerExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/3d/quaternionArcballExample/src/{testApp.cpp => ofApp.cpp} (80%)
 rename examples/3d/quaternionArcballExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/3d/quaternionLatLongExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/3d/quaternionLatLongExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/addons/3DModelLoaderExample/src/{testApp.cpp => ofApp.cpp} (86%)
 rename examples/addons/3DModelLoaderExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/addons/allAddonsExample/src/{testApp.cpp => ofApp.cpp} (62%)
 rename examples/addons/allAddonsExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/addons/assimpExample/src/{testApp.cpp => ofApp.cpp} (91%)
 rename examples/addons/assimpExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/addons/kinectExample/src/{testApp.cpp => ofApp.cpp} (94%)
 rename examples/addons/kinectExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/addons/networkTcpClientExample/src/{testApp.cpp => ofApp.cpp} (85%)
 rename examples/addons/networkTcpClientExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/addons/networkTcpServerExample/src/{testApp.cpp => ofApp.cpp} (84%)
 rename examples/addons/networkTcpServerExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/addons/networkUdpReceiverExample/src/{testApp.cpp => ofApp.cpp} (78%)
 rename examples/addons/networkUdpReceiverExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/addons/networkUdpSenderExample/src/{testApp.cpp => ofApp.cpp} (76%)
 rename examples/addons/networkUdpSenderExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/addons/opencvExample/src/{testApp.cpp => ofApp.cpp} (88%)
 rename examples/addons/opencvExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/addons/opencvHaarFinderExample/src/{testApp.cpp => ofApp.cpp} (66%)
 rename examples/addons/opencvHaarFinderExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/addons/oscChatSystemExample/src/{testApp.cpp => ofApp.cpp} (92%)
 rename examples/addons/oscChatSystemExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/addons/oscReceiveExample/src/{testApp.cpp => ofApp.cpp} (86%)
 rename examples/addons/oscReceiveExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/addons/oscSenderExample/src/{testApp.cpp => ofApp.cpp} (79%)
 rename examples/addons/oscSenderExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/addons/svgExample/src/{testApp.cpp => ofApp.cpp} (79%)
 rename examples/addons/svgExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/addons/threadedImageLoaderExample/src/{testApp.cpp => ofApp.cpp} (74%)
 rename examples/addons/threadedImageLoaderExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/addons/vectorGraphicsExample/src/{testApp.cpp => ofApp.cpp} (94%)
 rename examples/addons/vectorGraphicsExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/addons/xmlSettingsExample/src/{testApp.cpp => ofApp.cpp} (93%)
 rename examples/addons/xmlSettingsExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/android/android3DModelLoaderExample/src/{testApp.cpp => ofApp.cpp} (84%)
 rename examples/android/android3DModelLoaderExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidAccelerometerExample/src/{testApp.cpp => ofApp.cpp} (76%)
 rename examples/android/androidAccelerometerExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/android/androidAdvanced3DExample/src/{testApp.cpp => ofApp.cpp} (92%)
 rename examples/android/androidAdvanced3DExample/src/{testApp.h => ofApp.h} (98%)
 rename examples/android/androidAssimpExample/src/{testApp.cpp => ofApp.cpp} (81%)
 rename examples/android/androidAssimpExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/android/androidAudioExample/src/{testApp.cpp => ofApp.cpp} (79%)
 rename examples/android/androidAudioExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/android/androidCameraExample/src/{testApp.cpp => ofApp.cpp} (74%)
 rename examples/android/androidCameraExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidEmptyExample/src/{testApp.cpp => ofApp.cpp} (65%)
 rename examples/android/androidEmptyExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidFontExample/src/{testApp.cpp => ofApp.cpp} (68%)
 rename examples/android/androidFontExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidGuiExample/src/{testApp.cpp => ofApp.cpp} (76%)
 rename examples/android/androidGuiExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/android/androidImageExample/src/{testApp.cpp => ofApp.cpp} (67%)
 rename examples/android/androidImageExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidOpenCVExample/src/{testApp.cpp => ofApp.cpp} (78%)
 rename examples/android/androidOpenCVExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/android/androidOpenCVFaceExample/src/{testApp.cpp => ofApp.cpp} (80%)
 rename examples/android/androidOpenCVFaceExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/android/androidPolygonExample/src/{testApp.cpp => ofApp.cpp} (94%)
 rename examples/android/androidPolygonExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/android/androidShaderExample/src/{testApp.cpp => ofApp.cpp} (77%)
 rename examples/android/androidShaderExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidSoundPlayerExample/src/{testApp.cpp => ofApp.cpp} (84%)
 rename examples/android/androidSoundPlayerExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidSwipeExample/src/{testApp.cpp => ofApp.cpp} (61%)
 rename examples/android/androidSwipeExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidTouchExample/src/{testApp.cpp => ofApp.cpp} (71%)
 rename examples/android/androidTouchExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidVBOExample/src/{testApp.cpp => ofApp.cpp} (83%)
 rename examples/android/androidVBOExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/android/androidVibratorExample/src/{testApp.cpp => ofApp.cpp} (75%)
 rename examples/android/androidVibratorExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/android/androidVideoExample/src/{testApp.cpp => ofApp.cpp} (66%)
 rename examples/android/androidVideoExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/communication/firmataExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/communication/firmataExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/communication/serialExample/src/{testApp.cpp => ofApp.cpp} (85%)
 rename examples/communication/serialExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/empty/emptyExample/src/{testApp.cpp => ofApp.cpp} (62%)
 rename examples/empty/emptyExample/src/{testApp.h => ofApp.h} (92%)
 rename examples/events/advancedEventsExample/src/{testApp.cpp => ofApp.cpp} (65%)
 rename examples/events/advancedEventsExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/events/customEventExample/src/{testApp.cpp => ofApp.cpp} (90%)
 rename examples/events/customEventExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/events/eventsExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/events/eventsExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/events/simpleEventsExample/src/{testApp.cpp => ofApp.cpp} (73%)
 rename examples/events/simpleEventsExample/src/{testApp.h => ofApp.h} (91%)
 rename examples/events/simpleTimer/src/{testApp.cpp => ofApp.cpp} (85%)
 rename examples/events/simpleTimer/src/{testApp.h => ofApp.h} (94%)
 rename examples/gl/alphaMaskingShaderExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/gl/alphaMaskingShaderExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/billboardExample/src/{testApp.cpp => ofApp.cpp} (88%)
 rename examples/gl/billboardExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/billboardRotationExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/gl/billboardRotationExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/fboTrailsExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/gl/fboTrailsExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/geometryShaderExample/src/{testApp.cpp => ofApp.cpp} (81%)
 rename examples/gl/geometryShaderExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/gl/glInfoExample/src/{testApp.cpp => ofApp.cpp} (95%)
 rename examples/gl/glInfoExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/gpuParticleSystemExample/src/{testApp.cpp => ofApp.cpp} (93%)
 rename examples/gl/gpuParticleSystemExample/src/{testApp.h => ofApp.h} (98%)
 rename examples/gl/multiLightExample/src/{testApp.cpp => ofApp.cpp} (93%)
 rename examples/gl/multiLightExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/multiTextureShaderExample/src/{testApp.cpp => ofApp.cpp} (91%)
 rename examples/gl/multiTextureShaderExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/pointsAsTextures/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/gl/pointsAsTextures/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/shaderExample/src/{testApp.cpp => ofApp.cpp} (81%)
 rename examples/gl/shaderExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/gl/singleLightExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/gl/singleLightExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/slowFastRendering/src/{testApp.cpp => ofApp.cpp} (88%)
 rename examples/gl/slowFastRendering/src/{testApp.h => ofApp.h} (96%)
 rename examples/gl/textureExample/src/{testApp.cpp => ofApp.cpp} (84%)
 rename examples/gl/textureExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gl/textureScreengrabExample/src/{testApp.cpp => ofApp.cpp} (82%)
 rename examples/gl/textureScreengrabExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/gl/vboExample/src/{testApp.cpp => ofApp.cpp} (85%)
 rename examples/gl/vboExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/gl/vboMeshDrawInstancedExample/src/{testApp.cpp => ofApp.cpp} (90%)
 rename examples/gl/vboMeshDrawInstancedExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/gl/viewportExample/src/{testApp.cpp => ofApp.cpp} (83%)
 rename examples/gl/viewportExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/gles/customEGLWindowSettings/src/{testApp.cpp => ofApp.cpp} (54%)
 rename examples/gles/customEGLWindowSettings/src/{testApp.h => ofApp.h} (93%)
 rename examples/graphics/blendingExample/src/{testApp.cpp => ofApp.cpp} (79%)
 rename examples/graphics/blendingExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/color/src/{testApp.cpp => ofApp.cpp} (91%)
 rename examples/graphics/color/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/colorsExtended/src/{testApp.cpp => ofApp.cpp} (95%)
 rename examples/graphics/colorsExtended/src/{testApp.h => ofApp.h} (95%)
 rename examples/graphics/floatingPointImageExample/src/{testApp.cpp => ofApp.cpp} (75%)
 rename examples/graphics/floatingPointImageExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/graphics/fontShapesExample/src/{testApp.cpp => ofApp.cpp} (85%)
 rename examples/graphics/fontShapesExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/fontsExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/graphics/fontsExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/graphicsExample/src/{testApp.cpp => ofApp.cpp} (85%)
 rename examples/graphics/graphicsExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/graphics/imageCompressionExample/src/{testApp.cpp => ofApp.cpp} (83%)
 rename examples/graphics/imageCompressionExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/imageLoaderExample/src/{testApp.cpp => ofApp.cpp} (83%)
 rename examples/graphics/imageLoaderExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/imageLoaderWebExample/src/{testApp.cpp => ofApp.cpp} (78%)
 rename examples/graphics/imageLoaderWebExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/imageSaverExample/src/{testApp.cpp => ofApp.cpp} (81%)
 rename examples/graphics/imageSaverExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/imageSequenceExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/graphics/imageSequenceExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/imageSubsectionExample/src/{testApp.cpp => ofApp.cpp} (80%)
 rename examples/graphics/imageSubsectionExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/graphics/lutFilterExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/graphics/lutFilterExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/graphics/pdfExample/src/{testApp.cpp => ofApp.cpp} (90%)
 rename examples/graphics/pdfExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/graphics/polygonExample/src/{testApp.cpp => ofApp.cpp} (95%)
 rename examples/graphics/polygonExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/graphics/polylineBlobsExample/src/{testApp.cpp => ofApp.cpp} (88%)
 rename examples/graphics/polylineBlobsExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/graphics/rectangleAlignmentAndScaling/src/{testApp.cpp => ofApp.cpp} (93%)
 rename examples/graphics/rectangleAlignmentAndScaling/src/{testApp.h => ofApp.h} (98%)
 rename examples/graphics/simpleColorKey/src/{testApp.cpp => ofApp.cpp} (78%)
 rename examples/graphics/simpleColorKey/src/{testApp.h => ofApp.h} (95%)
 rename examples/gui/guiExample/src/{testApp.cpp => ofApp.cpp} (75%)
 rename examples/gui/guiExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/gui/guiFromParametersExample/src/{testApp.cpp => ofApp.cpp} (74%)
 rename examples/gui/guiFromParametersExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/gui/oscParametersReceiver/src/{testApp.cpp => ofApp.cpp} (74%)
 rename examples/gui/oscParametersReceiver/src/{testApp.h => ofApp.h} (95%)
 rename examples/gui/oscParametersSender/src/{testApp.cpp => ofApp.cpp} (74%)
 rename examples/gui/oscParametersSender/src/{testApp.h => ofApp.h} (95%)
 rename examples/gui/parameterEdgeCasesExample/src/{testApp.cpp => ofApp.cpp} (80%)
 rename examples/gui/parameterEdgeCasesExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/gui/parameterGroupExample/src/{testApp.cpp => ofApp.cpp} (78%)
 rename examples/gui/parameterGroupExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/3DPrimitivesExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/3DPrimitivesExample/src/{testApp.mm => ofApp.mm} (96%)
 rename examples/ios/CoreLocationExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/CoreLocationExample/src/{testApp.mm => ofApp.mm} (80%)
 rename examples/ios/ImagePickerExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/ImagePickerExample/src/{testApp.mm => ofApp.mm} (80%)
 rename examples/ios/KeyboardExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/ios/KeyboardExample/src/{testApp.mm => ofApp.mm} (74%)
 rename examples/ios/MapKitExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/ios/MapKitExample/src/{testApp.mm => ofApp.mm} (76%)
 rename examples/ios/TouchAndAccelExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/TouchAndAccelExample/src/{testApp.mm => ofApp.mm} (81%)
 rename examples/ios/advancedEventsExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/advancedEventsExample/src/{testApp.mm => ofApp.mm} (69%)
 rename examples/ios/advancedGraphics/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/advancedGraphics/src/{testApp.mm => ofApp.mm} (91%)
 rename examples/ios/assimpExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/assimpExample/src/{testApp.mm => ofApp.mm} (86%)
 rename examples/ios/audioInputExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/audioInputExample/src/{testApp.mm => ofApp.mm} (83%)
 rename examples/ios/audioOutputExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/audioOutputExample/src/{testApp.mm => ofApp.mm} (89%)
 rename examples/ios/dirListExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/dirListExample/src/{testApp.mm => ofApp.mm} (80%)
 rename examples/ios/{iosNativeExample/src/testApp.h => emptyExample/src/ofApp.h} (94%)
 rename examples/ios/emptyExample/src/{testApp.mm => ofApp.mm} (63%)
 rename examples/ios/eventsExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/eventsExample/src/{testApp.mm => ofApp.mm} (80%)
 rename examples/ios/fontShapesExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/fontShapesExample/src/{testApp.mm => ofApp.mm} (82%)
 rename examples/ios/fontsExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/fontsExample/src/{testApp.mm => ofApp.mm} (90%)
 rename examples/ios/graphicsExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/ios/graphicsExample/src/{testApp.mm => ofApp.mm} (85%)
 rename examples/ios/iPhoneGuiExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/iPhoneGuiExample/src/{testApp.mm => ofApp.mm} (79%)
 rename examples/ios/imageLoaderExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/imageLoaderExample/src/{testApp.mm => ofApp.mm} (80%)
 rename examples/ios/{emptyExample/src/testApp.h => iosCustomSizeExample/src/ofApp.h} (94%)
 rename examples/ios/iosCustomSizeExample/src/{testApp.mm => ofApp.mm} (83%)
 rename examples/ios/iosES2ShaderExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/iosES2ShaderExample/src/{testApp.mm => ofApp.mm} (82%)
 rename examples/ios/iosExternalDisplayExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/ios/iosExternalDisplayExample/src/{testApp.mm => ofApp.mm} (91%)
 rename examples/ios/{iosCustomSizeExample/src/testApp.h => iosNativeExample/src/ofApp.h} (94%)
 rename examples/ios/iosNativeExample/src/{testApp.mm => ofApp.mm} (64%)
 rename examples/ios/iosOrientationExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/iosOrientationExample/src/{testApp.mm => ofApp.mm} (86%)
 rename examples/ios/moviePlayerExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/moviePlayerExample/src/{testApp.mm => ofApp.mm} (83%)
 rename examples/ios/ofxGuiExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/ofxGuiExample/src/{testApp.mm => ofApp.mm} (75%)
 rename examples/ios/opencvExample/src/{testApp.h => ofApp.h} (97%)
 rename examples/ios/opencvExample/src/{testApp.mm => ofApp.mm} (87%)
 rename examples/ios/opencvFaceExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/opencvFaceExample/src/{testApp.mm => ofApp.mm} (83%)
 rename examples/ios/oscReceiverExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/oscReceiverExample/src/{testApp.mm => ofApp.mm} (86%)
 rename examples/ios/oscSenderExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/ios/oscSenderExample/src/{testApp.mm => ofApp.mm} (78%)
 rename examples/ios/polygonExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/polygonExample/src/{testApp.mm => ofApp.mm} (95%)
 rename examples/ios/soundPlayerExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/soundPlayerExample/src/{testApp.mm => ofApp.mm} (90%)
 rename examples/ios/textureExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/textureExample/src/{testApp.mm => ofApp.mm} (85%)
 rename examples/ios/vboExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/vboExample/src/{testApp.mm => ofApp.mm} (85%)
 rename examples/ios/videoGrabberExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/ios/videoGrabberExample/src/{testApp.mm => ofApp.mm} (76%)
 rename examples/ios/xmlSettingsExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/ios/xmlSettingsExample/src/{testApp.mm => ofApp.mm} (93%)
 rename examples/math/noise1dExample/src/{testApp.cpp => ofApp.cpp} (91%)
 rename examples/math/noise1dExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/math/noise1dOctaveExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/math/noise1dOctaveExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/math/noiseField2dExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/math/noiseField2dExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/math/particlesExample/src/{testApp.cpp => ofApp.cpp} (85%)
 rename examples/math/particlesExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/math/periodicSignalsExample/src/{testApp.cpp => ofApp.cpp} (88%)
 rename examples/math/periodicSignalsExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/math/trigonometricMotionExample/src/{testApp.cpp => ofApp.cpp} (93%)
 rename examples/math/trigonometricMotionExample/src/{testApp.h => ofApp.h} (99%)
 rename examples/math/trigonometryExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/math/trigonometryExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/math/vectorMathExample/src/{testApp.cpp => ofApp.cpp} (90%)
 rename examples/math/vectorMathExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/sound/audioInputExample/src/{testApp.cpp => ofApp.cpp} (88%)
 rename examples/sound/audioInputExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/sound/audioOutputExample/src/{testApp.cpp => ofApp.cpp} (88%)
 rename examples/sound/audioOutputExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/sound/soundPlayerExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/sound/soundPlayerExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/sound/soundPlayerFFTExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/sound/soundPlayerFFTExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/utils/conversionExample/src/{testApp.cpp => ofApp.cpp} (89%)
 rename examples/utils/conversionExample/src/{testApp.h => ofApp.h} (92%)
 rename examples/utils/dirListExample/src/{testApp.cpp => ofApp.cpp} (80%)
 rename examples/utils/dirListExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/utils/dragDropExample/src/{testApp.cpp => ofApp.cpp} (73%)
 rename examples/utils/dragDropExample/src/{testApp.h => ofApp.h} (93%)
 rename examples/utils/fileBufferLoadingCSVExample/src/{testApp.cpp => ofApp.cpp} (83%)
 rename examples/utils/fileBufferLoadingCSVExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/utils/fileOpenSaveDialogExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/utils/fileOpenSaveDialogExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/utils/loadTextFileExample/src/{testApp.cpp => ofApp.cpp} (86%)
 rename examples/utils/loadTextFileExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/utils/loggingExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/utils/loggingExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/utils/regularExpressionExample/src/{testApp.cpp => ofApp.cpp} (91%)
 rename examples/utils/regularExpressionExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/utils/sortingExample/src/{testApp.cpp => ofApp.cpp} (86%)
 rename examples/utils/sortingExample/src/{testApp.h => ofApp.h} (96%)
 rename examples/utils/systemSpeakExample/src/{testApp.cpp => ofApp.cpp} (83%)
 rename examples/utils/systemSpeakExample/src/{testApp.h => ofApp.h} (92%)
 rename examples/utils/threadExample/src/{testApp.cpp => ofApp.cpp} (73%)
 rename examples/utils/threadExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/utils/windowExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/utils/windowExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/utils/xmlExample/src/{testApp.cpp => ofApp.cpp} (94%)
 rename examples/utils/xmlExample/src/{testApp.h => ofApp.h} (97%)
 rename examples/video/asciiVideo/src/{testApp.cpp => ofApp.cpp} (84%)
 rename examples/video/asciiVideo/src/{testApp.h => ofApp.h} (94%)
 rename examples/video/osxHighPerformanceVideoPlayerExample/src/{testApp.cpp => ofApp.cpp} (91%)
 rename examples/video/osxHighPerformanceVideoPlayerExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/video/osxVideoRecorderExample/src/{testApp.cpp => ofApp.cpp} (91%)
 rename examples/video/osxVideoRecorderExample/src/{testApp.h => ofApp.h} (95%)
 rename examples/video/videoGrabberExample/src/{testApp.cpp => ofApp.cpp} (83%)
 rename examples/video/videoGrabberExample/src/{testApp.h => ofApp.h} (94%)
 rename examples/video/videoPlayerExample/src/{testApp.cpp => ofApp.cpp} (87%)
 rename examples/video/videoPlayerExample/src/{testApp.h => ofApp.h} (93%)

diff --git a/apps/projectGenerator/projectGeneratorSimple b/apps/projectGenerator/projectGeneratorSimple
index 60df7b0895b..71beb1af675 160000
--- a/apps/projectGenerator/projectGeneratorSimple
+++ b/apps/projectGenerator/projectGeneratorSimple
@@ -1 +1 @@
-Subproject commit 60df7b0895b050aead88988079342ac9ca862eaf
+Subproject commit 71beb1af675031de9cd02eecbb152a2c22407579
diff --git a/examples/3d/3DPrimitivesExample/src/main.cpp b/examples/3d/3DPrimitivesExample/src/main.cpp
index 863fa9295d2..33667fd1414 100644
--- a/examples/3d/3DPrimitivesExample/src/main.cpp
+++ b/examples/3d/3DPrimitivesExample/src/main.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
 int main(){
 	ofSetupOpenGL(1280, 720, OF_WINDOW);
-	ofRunApp(new testApp()); // start the app
+	ofRunApp(new ofApp()); // start the app
 }
diff --git a/examples/3d/3DPrimitivesExample/src/testApp.cpp b/examples/3d/3DPrimitivesExample/src/ofApp.cpp
similarity index 97%
rename from examples/3d/3DPrimitivesExample/src/testApp.cpp
rename to examples/3d/3DPrimitivesExample/src/ofApp.cpp
index 5078df96a90..663552b08b0 100644
--- a/examples/3d/3DPrimitivesExample/src/testApp.cpp
+++ b/examples/3d/3DPrimitivesExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	ofSetVerticalSync(true);
 	ofBackground(20);
@@ -54,7 +54,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
     pointLight.setPosition((ofGetWidth()*.5)+ cos(ofGetElapsedTimef()*.5)*(ofGetWidth()*.3), ofGetHeight()/2, 500);
     pointLight2.setPosition((ofGetWidth()*.5)+ cos(ofGetElapsedTimef()*.15)*(ofGetWidth()*.3),
                             ofGetHeight()*.5 + sin(ofGetElapsedTimef()*.7)*(ofGetHeight()), -300);
@@ -72,7 +72,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
     
     float spinX = sin(ofGetElapsedTimef()*.35f);
     float spinY = cos(ofGetElapsedTimef()*.075f);
@@ -432,7 +432,7 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key) {
+void ofApp::keyPressed(int key) {
     
 	switch(key) {
 		case 'f':
@@ -608,42 +608,42 @@ void testApp::keyPressed(int key) {
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     bMousePressed = true;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     bMousePressed = false;
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/3DPrimitivesExample/src/testApp.h b/examples/3d/3DPrimitivesExample/src/ofApp.h
similarity index 97%
rename from examples/3d/3DPrimitivesExample/src/testApp.h
rename to examples/3d/3DPrimitivesExample/src/ofApp.h
index 16ba2ee8360..bdb04189ba8 100644
--- a/examples/3d/3DPrimitivesExample/src/testApp.h
+++ b/examples/3d/3DPrimitivesExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 public:
 	void setup();
diff --git a/examples/3d/advanced3dExample/src/main.cpp b/examples/3d/advanced3dExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/advanced3dExample/src/main.cpp
+++ b/examples/3d/advanced3dExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/advanced3dExample/src/testApp.cpp b/examples/3d/advanced3dExample/src/ofApp.cpp
similarity index 93%
rename from examples/3d/advanced3dExample/src/testApp.cpp
rename to examples/3d/advanced3dExample/src/ofApp.cpp
index a2fd24a96e2..15d42b62109 100644
--- a/examples/3d/advanced3dExample/src/testApp.cpp
+++ b/examples/3d/advanced3dExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
 //
@@ -30,7 +30,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	ofSetVerticalSync(true);
 	ofBackground(70, 70, 70);
@@ -91,7 +91,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::setupViewports(){
+void ofApp::setupViewports(){
 	//call here whenever we resize the window
 
 
@@ -119,13 +119,13 @@ void testApp::setupViewports(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofDrawBitmapString("test", 10, 10);
 
@@ -206,7 +206,7 @@ void testApp::draw(){
 	//--
 }
 
-void testApp::drawScene(int iCameraDraw){
+void ofApp::drawScene(int iCameraDraw){
 
 	nodeSwarm.draw();
 	nodeGrid.draw();
@@ -335,7 +335,7 @@ void testApp::drawScene(int iCameraDraw){
 }
 
 //--------------------------------------------------------------
-void testApp::updateMouseRay(){
+void ofApp::updateMouseRay(){
 	// Define ray in screen space
 	ray[0] = ofVec3f(ofGetMouseX(), ofGetMouseY(), -1);
 	ray[1] = ofVec3f(ofGetMouseX(), ofGetMouseY(), 1);
@@ -346,7 +346,7 @@ void testApp::updateMouseRay(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 	if(key >= '1' && key <= '4'){
 		iMainCamera = key - '1';
@@ -375,27 +375,27 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	setupViewports();
 }
 
diff --git a/examples/3d/advanced3dExample/src/testApp.h b/examples/3d/advanced3dExample/src/ofApp.h
similarity index 97%
rename from examples/3d/advanced3dExample/src/testApp.h
rename to examples/3d/advanced3dExample/src/ofApp.h
index d6ee6ba69a7..9785a899538 100644
--- a/examples/3d/advanced3dExample/src/testApp.h
+++ b/examples/3d/advanced3dExample/src/ofApp.h
@@ -19,7 +19,7 @@
 
 #define N_CAMERAS 4
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 
 	public:
 		void setup();
diff --git a/examples/3d/cameraLensOffsetExample/src/main.cpp b/examples/3d/cameraLensOffsetExample/src/main.cpp
index 3d9e24a0639..912ef0f5fff 100755
--- a/examples/3d/cameraLensOffsetExample/src/main.cpp
+++ b/examples/3d/cameraLensOffsetExample/src/main.cpp
@@ -1,6 +1,6 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 int main() {
 	ofSetupOpenGL(1280, 720, OF_WINDOW);
-	ofRunApp(new testApp());
+	ofRunApp(new ofApp());
 }
diff --git a/examples/3d/cameraLensOffsetExample/src/testApp.cpp b/examples/3d/cameraLensOffsetExample/src/ofApp.cpp
similarity index 88%
rename from examples/3d/cameraLensOffsetExample/src/testApp.cpp
rename to examples/3d/cameraLensOffsetExample/src/ofApp.cpp
index 015f5c98bea..25a82756be5 100755
--- a/examples/3d/cameraLensOffsetExample/src/testApp.cpp
+++ b/examples/3d/cameraLensOffsetExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofEnableSmoothing();
 	ofSetVerticalSync(true);
 	
@@ -38,7 +38,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	video.update();
 	finder.findHaarObjects(video.getPixelsRef());
 	
@@ -78,7 +78,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::drawScene(bool isPreview){
+void ofApp::drawScene(bool isPreview){
 	
 	ofEnableDepthTest();
 
@@ -151,7 +151,7 @@ void testApp::drawScene(bool isPreview){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofBackgroundGradient(ofColor(50), ofColor(0));
 	//------
@@ -210,47 +210,47 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if (key == ' ')
 		usePreview = !usePreview;
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/cameraLensOffsetExample/src/testApp.h b/examples/3d/cameraLensOffsetExample/src/ofApp.h
similarity index 96%
rename from examples/3d/cameraLensOffsetExample/src/testApp.h
rename to examples/3d/cameraLensOffsetExample/src/ofApp.h
index c1c6b1ca0d2..f2da9fcb1b8 100755
--- a/examples/3d/cameraLensOffsetExample/src/testApp.h
+++ b/examples/3d/cameraLensOffsetExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxCvHaarFinder.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/3d/cameraParentingExample/src/main.cpp b/examples/3d/cameraParentingExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/cameraParentingExample/src/main.cpp
+++ b/examples/3d/cameraParentingExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/cameraParentingExample/src/testApp.cpp b/examples/3d/cameraParentingExample/src/ofApp.cpp
similarity index 93%
rename from examples/3d/cameraParentingExample/src/testApp.cpp
rename to examples/3d/cameraParentingExample/src/ofApp.cpp
index 33fb6ce6ac1..13968eb6662 100644
--- a/examples/3d/cameraParentingExample/src/testApp.cpp
+++ b/examples/3d/cameraParentingExample/src/ofApp.cpp
@@ -1,11 +1,11 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 #define kMoveInc 10
 #define kRotInc 5
 
 // reset all transformations and options to defaults
 //--------------------------------------------------------------
-void testApp::reset() {
+void ofApp::reset() {
 	camToView = 0;
 	camToConfigure = 1;
 	
@@ -29,7 +29,7 @@ void testApp::reset() {
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofEnableDepthTest();
 	ofSetVerticalSync(true);
 	ofEnableLighting();
@@ -47,7 +47,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	float freqMult = 1;
 	float amp = 30;
 	float scale = 1;
@@ -68,7 +68,7 @@ void testApp::update(){
 
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackground(0);
 	
 	string s = string("") + 
@@ -171,7 +171,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	ofNode *n = &cam[camToConfigure];
 	
 	switch(key) {
@@ -260,40 +260,40 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/3d/cameraParentingExample/src/testApp.h b/examples/3d/cameraParentingExample/src/ofApp.h
similarity index 96%
rename from examples/3d/cameraParentingExample/src/testApp.h
rename to examples/3d/cameraParentingExample/src/ofApp.h
index 46077763726..06ce65d05d6 100644
--- a/examples/3d/cameraParentingExample/src/testApp.h
+++ b/examples/3d/cameraParentingExample/src/ofApp.h
@@ -6,7 +6,7 @@
 #define kNumCameras 2
 #define kNumLights 3
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/3d/cameraRibbonExample/src/main.cpp b/examples/3d/cameraRibbonExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/cameraRibbonExample/src/main.cpp
+++ b/examples/3d/cameraRibbonExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/cameraRibbonExample/src/testApp.cpp b/examples/3d/cameraRibbonExample/src/ofApp.cpp
similarity index 89%
rename from examples/3d/cameraRibbonExample/src/testApp.cpp
rename to examples/3d/cameraRibbonExample/src/ofApp.cpp
index 93aaeb96b4a..20b4539d955 100644
--- a/examples/3d/cameraRibbonExample/src/testApp.cpp
+++ b/examples/3d/cameraRibbonExample/src/ofApp.cpp
@@ -10,10 +10,10 @@
  */
 
 
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	//just set up the openFrameworks stuff
     ofSetFrameRate(60);
     ofSetVerticalSync(true);
@@ -24,7 +24,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//don't move the points if we are using the camera
     if(!usecamera){
         ofVec3f sumOfAllPoints(0,0,0);
@@ -37,7 +37,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 
 	//if we're using the camera, start it.
@@ -98,17 +98,17 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
   //hitting any key swaps the camera view
   usecamera = !usecamera;
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	//if we are using the camera, the mouse moving should rotate it around the whole sculpture
     if(usecamera){
         float rotateAmount = ofMap(ofGetMouseX(), 0, ofGetWidth(), 0, 360);
@@ -134,31 +134,31 @@ void testApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/3d/cameraRibbonExample/src/testApp.h b/examples/3d/cameraRibbonExample/src/ofApp.h
similarity index 97%
rename from examples/3d/cameraRibbonExample/src/testApp.h
rename to examples/3d/cameraRibbonExample/src/ofApp.h
index d605dc134c0..2b100be57fd 100644
--- a/examples/3d/cameraRibbonExample/src/testApp.h
+++ b/examples/3d/cameraRibbonExample/src/ofApp.h
@@ -13,7 +13,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
   public:
     void setup();
diff --git a/examples/3d/easyCamExample/src/main.cpp b/examples/3d/easyCamExample/src/main.cpp
index d50a844b8f8..b156efd6462 100644
--- a/examples/3d/easyCamExample/src/main.cpp
+++ b/examples/3d/easyCamExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/easyCamExample/src/testApp.cpp b/examples/3d/easyCamExample/src/ofApp.cpp
similarity index 84%
rename from examples/3d/easyCamExample/src/testApp.cpp
rename to examples/3d/easyCamExample/src/ofApp.cpp
index 594e33b1279..11006e9f92d 100644
--- a/examples/3d/easyCamExample/src/testApp.cpp
+++ b/examples/3d/easyCamExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	
 	// this uses depth information for occlusion
@@ -16,12 +16,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	cam.begin();		
 	ofRotateX(ofRadToDeg(.5));
@@ -62,7 +62,7 @@ void testApp::draw(){
 	ofDrawBitmapStringHighlight(msg, 10, 20);
 }
 //--------------------------------------------------------------
-void testApp::drawInteractionArea(){
+void ofApp::drawInteractionArea(){
 	ofRectangle vp = ofGetCurrentViewport();
 	float r = MIN(vp.width, vp.height) * 0.5f;
 	float x = vp.width * 0.5f;
@@ -78,7 +78,7 @@ void testApp::drawInteractionArea(){
 	ofPopStyle();
 }
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	switch(key) {
 		case 'C':
 		case 'c':
@@ -98,41 +98,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/3d/easyCamExample/src/testApp.h b/examples/3d/easyCamExample/src/ofApp.h
similarity index 94%
rename from examples/3d/easyCamExample/src/testApp.h
rename to examples/3d/easyCamExample/src/ofApp.h
index 8f413189b44..d33708b1f49 100644
--- a/examples/3d/easyCamExample/src/testApp.h
+++ b/examples/3d/easyCamExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 	
 		void setup();
diff --git a/examples/3d/meshFromCamera/src/main.cpp b/examples/3d/meshFromCamera/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/meshFromCamera/src/main.cpp
+++ b/examples/3d/meshFromCamera/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/meshFromCamera/src/testApp.cpp b/examples/3d/meshFromCamera/src/ofApp.cpp
similarity index 89%
rename from examples/3d/meshFromCamera/src/testApp.cpp
rename to examples/3d/meshFromCamera/src/ofApp.cpp
index bff38e8f305..7018da44bca 100644
--- a/examples/3d/meshFromCamera/src/testApp.cpp
+++ b/examples/3d/meshFromCamera/src/ofApp.cpp
@@ -10,10 +10,10 @@
  */
 
 
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	ofSetVerticalSync(true);
 	ofSetFrameRate(60);
@@ -57,7 +57,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//grab a new frame
 	vidGrabber.update();
 	
@@ -95,7 +95,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	//we have to disable depth testing to draw the video frame
 	ofDisableDepthTest();
 //	vidGrabber.draw(20,20);
@@ -117,7 +117,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	switch(key) {
 		case 'f':
 			ofToggleFullscreen();
@@ -127,42 +127,42 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/meshFromCamera/src/testApp.h b/examples/3d/meshFromCamera/src/ofApp.h
similarity index 96%
rename from examples/3d/meshFromCamera/src/testApp.h
rename to examples/3d/meshFromCamera/src/ofApp.h
index 4e5adcb5415..25860bab429 100644
--- a/examples/3d/meshFromCamera/src/testApp.h
+++ b/examples/3d/meshFromCamera/src/ofApp.h
@@ -13,7 +13,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 public:
 	void setup();
diff --git a/examples/3d/modelNoiseExample/src/main.cpp b/examples/3d/modelNoiseExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/modelNoiseExample/src/main.cpp
+++ b/examples/3d/modelNoiseExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/modelNoiseExample/src/testApp.cpp b/examples/3d/modelNoiseExample/src/ofApp.cpp
similarity index 86%
rename from examples/3d/modelNoiseExample/src/testApp.cpp
rename to examples/3d/modelNoiseExample/src/ofApp.cpp
index 7c693f067e2..f85e9972abd 100644
--- a/examples/3d/modelNoiseExample/src/testApp.cpp
+++ b/examples/3d/modelNoiseExample/src/ofApp.cpp
@@ -12,10 +12,10 @@
  * Adapted during ofDevCon on 2/23/2012
  */
 
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	ofSetFrameRate(60);
 	ofSetVerticalSync(true);
@@ -35,12 +35,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofSetColor(255, 255, 255, 255);
 	
 	//first let's just draw the model with the model object
@@ -51,7 +51,7 @@ void testApp::draw(){
 }
 
 //draw the model the built-in way
-void testApp::drawWithModel(){
+void ofApp::drawWithModel(){
 	
 	//get the position of the model
 	ofVec3f position = model.getPosition();
@@ -73,7 +73,7 @@ void testApp::drawWithModel(){
 }
 
 //draw the model manually
-void testApp::drawWithMesh(){
+void ofApp::drawWithMesh(){
 
 	//get the model attributes we need
 	ofVec3f scale = model.getScale();
@@ -118,46 +118,46 @@ void testApp::drawWithMesh(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/modelNoiseExample/src/testApp.h b/examples/3d/modelNoiseExample/src/ofApp.h
similarity index 97%
rename from examples/3d/modelNoiseExample/src/testApp.h
rename to examples/3d/modelNoiseExample/src/ofApp.h
index d771052d759..9384d5d3f70 100644
--- a/examples/3d/modelNoiseExample/src/testApp.h
+++ b/examples/3d/modelNoiseExample/src/ofApp.h
@@ -18,7 +18,7 @@
 #include "ofMain.h"
 #include "ofxAssimpModelLoader.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
   public:
 	void setup();
diff --git a/examples/3d/normalsExample/src/main.cpp b/examples/3d/normalsExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/normalsExample/src/main.cpp
+++ b/examples/3d/normalsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/normalsExample/src/testApp.cpp b/examples/3d/normalsExample/src/ofApp.cpp
similarity index 91%
rename from examples/3d/normalsExample/src/testApp.cpp
rename to examples/3d/normalsExample/src/ofApp.cpp
index 38dd38a99d3..60220112c2a 100644
--- a/examples/3d/normalsExample/src/testApp.cpp
+++ b/examples/3d/normalsExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 		
     radius = 400;
     max = 60;
@@ -71,11 +71,11 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofEnableLighting();
     ofBackgroundGradient(ofColor(65,62,50),ofColor(25,22,10) );
     
@@ -131,46 +131,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/normalsExample/src/testApp.h b/examples/3d/normalsExample/src/ofApp.h
similarity index 94%
rename from examples/3d/normalsExample/src/testApp.h
rename to examples/3d/normalsExample/src/ofApp.h
index 9fa4a4da31a..16daf112621 100644
--- a/examples/3d/normalsExample/src/testApp.h
+++ b/examples/3d/normalsExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/3d/ofBoxExample/src/main.cpp b/examples/3d/ofBoxExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/ofBoxExample/src/main.cpp
+++ b/examples/3d/ofBoxExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/ofBoxExample/src/testApp.cpp b/examples/3d/ofBoxExample/src/ofApp.cpp
similarity index 81%
rename from examples/3d/ofBoxExample/src/testApp.cpp
rename to examples/3d/ofBoxExample/src/ofApp.cpp
index dfd733627c1..46b575d2f46 100644
--- a/examples/3d/ofBoxExample/src/testApp.cpp
+++ b/examples/3d/ofBoxExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 
 	// this uses depth information for occlusion
@@ -21,12 +21,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackground(0, 0, 0);
 	
 	float movementSpeed = .1;
@@ -72,46 +72,46 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/ofBoxExample/src/testApp.h b/examples/3d/ofBoxExample/src/ofApp.h
similarity index 94%
rename from examples/3d/ofBoxExample/src/testApp.h
rename to examples/3d/ofBoxExample/src/ofApp.h
index b5e6f9159ce..3c023e351ce 100644
--- a/examples/3d/ofBoxExample/src/testApp.h
+++ b/examples/3d/ofBoxExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/3d/orientationExample/src/main.cpp b/examples/3d/orientationExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/orientationExample/src/main.cpp
+++ b/examples/3d/orientationExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/orientationExample/src/testApp.cpp b/examples/3d/orientationExample/src/ofApp.cpp
similarity index 86%
rename from examples/3d/orientationExample/src/testApp.cpp
rename to examples/3d/orientationExample/src/ofApp.cpp
index 5dd6ae9d84a..7198ac1a54e 100644
--- a/examples/3d/orientationExample/src/testApp.cpp
+++ b/examples/3d/orientationExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 /*
 	rotateToNormal will rotate everything using ofRotate. the rotation amount
@@ -21,14 +21,14 @@ void rotateToNormal(ofVec3f normal) {
 }
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	// draw the vertices in pathLines as a line strip
 	pathLines.setMode(OF_PRIMITIVE_LINE_STRIP);
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	previous = current;
 	
 	// generate a noisy 3d position over time 
@@ -54,7 +54,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofColor cyan = ofColor::fromHex(0x00abec);
 	ofColor magenta = ofColor::fromHex(0xec008c);
 	ofColor yellow = ofColor::fromHex(0xffee00);
@@ -88,46 +88,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/orientationExample/src/testApp.h b/examples/3d/orientationExample/src/ofApp.h
similarity index 94%
rename from examples/3d/orientationExample/src/testApp.h
rename to examples/3d/orientationExample/src/ofApp.h
index 66fca0fcca0..4deae2525f7 100644
--- a/examples/3d/orientationExample/src/testApp.h
+++ b/examples/3d/orientationExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/3d/pointCloudExample/src/main.cpp b/examples/3d/pointCloudExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/pointCloudExample/src/main.cpp
+++ b/examples/3d/pointCloudExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/pointCloudExample/src/testApp.cpp b/examples/3d/pointCloudExample/src/ofApp.cpp
similarity index 79%
rename from examples/3d/pointCloudExample/src/testApp.cpp
rename to examples/3d/pointCloudExample/src/ofApp.cpp
index b57e937cd65..bff1491f73b 100644
--- a/examples/3d/pointCloudExample/src/testApp.cpp
+++ b/examples/3d/pointCloudExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	ofSetVerticalSync(true);
 	
 	// load an image from disk
@@ -32,12 +32,12 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofBackgroundGradient(ofColor::gray, ofColor::black, OF_GRADIENT_CIRCULAR);
 	
 	// even points can overlap with each other, let's avoid that
@@ -50,46 +50,46 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/3d/pointCloudExample/src/testApp.h b/examples/3d/pointCloudExample/src/ofApp.h
similarity index 93%
rename from examples/3d/pointCloudExample/src/testApp.h
rename to examples/3d/pointCloudExample/src/ofApp.h
index 5c7a6e882e7..54794b30801 100644
--- a/examples/3d/pointCloudExample/src/testApp.h
+++ b/examples/3d/pointCloudExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/3d/pointPickerExample/src/main.cpp b/examples/3d/pointPickerExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/pointPickerExample/src/main.cpp
+++ b/examples/3d/pointPickerExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/pointPickerExample/src/testApp.cpp b/examples/3d/pointPickerExample/src/ofApp.cpp
similarity index 78%
rename from examples/3d/pointPickerExample/src/testApp.cpp
rename to examples/3d/pointPickerExample/src/ofApp.cpp
index e9318c5d6c9..f8fc05d5519 100644
--- a/examples/3d/pointPickerExample/src/testApp.cpp
+++ b/examples/3d/pointPickerExample/src/ofApp.cpp
@@ -1,18 +1,18 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	mesh.load("lofi-bunny.ply");
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackgroundGradient(ofColor(64), ofColor(0));
 	
 	ofSetColor(255);
@@ -55,46 +55,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/pointPickerExample/src/testApp.h b/examples/3d/pointPickerExample/src/ofApp.h
similarity index 93%
rename from examples/3d/pointPickerExample/src/testApp.h
rename to examples/3d/pointPickerExample/src/ofApp.h
index 29d68842d05..bd8f69b4512 100644
--- a/examples/3d/pointPickerExample/src/testApp.h
+++ b/examples/3d/pointPickerExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/3d/quaternionArcballExample/src/main.cpp b/examples/3d/quaternionArcballExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/quaternionArcballExample/src/main.cpp
+++ b/examples/3d/quaternionArcballExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/quaternionArcballExample/src/testApp.cpp b/examples/3d/quaternionArcballExample/src/ofApp.cpp
similarity index 80%
rename from examples/3d/quaternionArcballExample/src/testApp.cpp
rename to examples/3d/quaternionArcballExample/src/ofApp.cpp
index 146fc7cdc7a..517e4ac9e75 100644
--- a/examples/3d/quaternionArcballExample/src/testApp.cpp
+++ b/examples/3d/quaternionArcballExample/src/ofApp.cpp
@@ -7,10 +7,10 @@
  * Created by James George on 2/23/2012
  */
 
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofNoFill();
 	ofSetFrameRate(30);
 	ofBackground(0);
@@ -20,12 +20,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	//translate so that 0,0 is the center of the screen
     ofPushMatrix();
@@ -43,21 +43,21 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 	//every time the mouse is dragged, track the change
 	//accumulate the changes inside of curRot through multiplication
@@ -69,27 +69,27 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     //store the last mouse point when it's first pressed to prevent popping
 	lastMouse = ofVec2f(x,y);
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/quaternionArcballExample/src/testApp.h b/examples/3d/quaternionArcballExample/src/ofApp.h
similarity index 96%
rename from examples/3d/quaternionArcballExample/src/testApp.h
rename to examples/3d/quaternionArcballExample/src/ofApp.h
index eae54ff4529..01565ee42e8 100644
--- a/examples/3d/quaternionArcballExample/src/testApp.h
+++ b/examples/3d/quaternionArcballExample/src/ofApp.h
@@ -13,7 +13,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
  public:
 	void setup();
diff --git a/examples/3d/quaternionLatLongExample/src/main.cpp b/examples/3d/quaternionLatLongExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/3d/quaternionLatLongExample/src/main.cpp
+++ b/examples/3d/quaternionLatLongExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/3d/quaternionLatLongExample/src/testApp.cpp b/examples/3d/quaternionLatLongExample/src/ofApp.cpp
similarity index 87%
rename from examples/3d/quaternionLatLongExample/src/testApp.cpp
rename to examples/3d/quaternionLatLongExample/src/ofApp.cpp
index 8ed20ae7e15..bbdc3ad5782 100644
--- a/examples/3d/quaternionLatLongExample/src/testApp.cpp
+++ b/examples/3d/quaternionLatLongExample/src/ofApp.cpp
@@ -6,10 +6,10 @@
  * Created by James George on 2/23/2012
  */
 
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	ofSetFrameRate(30);
 	ofEnableAlphaBlending();
@@ -42,12 +42,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackground(0);
 	
 	ofPushMatrix();
@@ -92,46 +92,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/3d/quaternionLatLongExample/src/testApp.h b/examples/3d/quaternionLatLongExample/src/ofApp.h
similarity index 93%
rename from examples/3d/quaternionLatLongExample/src/testApp.h
rename to examples/3d/quaternionLatLongExample/src/ofApp.h
index 8b87317fbe2..7420b6a6d71 100644
--- a/examples/3d/quaternionLatLongExample/src/testApp.h
+++ b/examples/3d/quaternionLatLongExample/src/ofApp.h
@@ -8,7 +8,7 @@ typedef struct {
 	float longitude;
 } City;
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
   public:
 	void setup();
diff --git a/examples/addons/3DModelLoaderExample/src/main.cpp b/examples/addons/3DModelLoaderExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/addons/3DModelLoaderExample/src/main.cpp
+++ b/examples/addons/3DModelLoaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/3DModelLoaderExample/src/testApp.cpp b/examples/addons/3DModelLoaderExample/src/ofApp.cpp
similarity index 86%
rename from examples/addons/3DModelLoaderExample/src/testApp.cpp
rename to examples/addons/3DModelLoaderExample/src/ofApp.cpp
index dfe1f7a6a92..ce2c112502b 100644
--- a/examples/addons/3DModelLoaderExample/src/testApp.cpp
+++ b/examples/addons/3DModelLoaderExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 GLfloat lightOnePosition[] = {40.0, 40, 100.0, 0.0};
 GLfloat lightOneColor[] = {0.99, 0.99, 0.99, 1.0};
@@ -7,7 +7,7 @@ GLfloat lightTwoPosition[] = {-40.0, 40, 100.0, 0.0};
 GLfloat lightTwoColor[] = {0.99, 0.99, 0.99, 1.0};
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofBackground(255,255,255);
 		
 	ofSetVerticalSync(true);
@@ -41,13 +41,13 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     squirrelModel.setRotation(1, 270 + ofGetElapsedTimef() * 60, 0, 0, 1);
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	 //fake back wall
     ofSetColor(20, 20, 20);
@@ -88,46 +88,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){ 
+void ofApp::keyPressed(int key){ 
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/3DModelLoaderExample/src/testApp.h b/examples/addons/3DModelLoaderExample/src/ofApp.h
similarity index 93%
rename from examples/addons/3DModelLoaderExample/src/testApp.h
rename to examples/addons/3DModelLoaderExample/src/ofApp.h
index 0168cb2af30..6de13b3e242 100644
--- a/examples/addons/3DModelLoaderExample/src/testApp.h
+++ b/examples/addons/3DModelLoaderExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofx3DModelLoader.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/addons/allAddonsExample/src/main.cpp b/examples/addons/allAddonsExample/src/main.cpp
index 89e0d0f71bc..cd8fe2fa6d8 100644
--- a/examples/addons/allAddonsExample/src/main.cpp
+++ b/examples/addons/allAddonsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/allAddonsExample/src/testApp.cpp b/examples/addons/allAddonsExample/src/ofApp.cpp
similarity index 62%
rename from examples/addons/allAddonsExample/src/testApp.cpp
rename to examples/addons/allAddonsExample/src/ofApp.cpp
index 98f37611a6c..b182cce2c21 100644
--- a/examples/addons/allAddonsExample/src/testApp.cpp
+++ b/examples/addons/allAddonsExample/src/ofApp.cpp
@@ -1,61 +1,61 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/allAddonsExample/src/testApp.h b/examples/addons/allAddonsExample/src/ofApp.h
similarity index 96%
rename from examples/addons/allAddonsExample/src/testApp.h
rename to examples/addons/allAddonsExample/src/ofApp.h
index d3678f01499..4a907379b3d 100644
--- a/examples/addons/allAddonsExample/src/testApp.h
+++ b/examples/addons/allAddonsExample/src/ofApp.h
@@ -10,7 +10,7 @@
 #include "ofxAssimpModelLoader.h"
 #include "ofxThreadedImageLoader.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/addons/assimpExample/src/main.cpp b/examples/addons/assimpExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/addons/assimpExample/src/main.cpp
+++ b/examples/addons/assimpExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/assimpExample/src/testApp.cpp b/examples/addons/assimpExample/src/ofApp.cpp
similarity index 91%
rename from examples/addons/assimpExample/src/testApp.cpp
rename to examples/addons/assimpExample/src/ofApp.cpp
index 14487d61804..b3970472526 100644
--- a/examples/addons/assimpExample/src/testApp.cpp
+++ b/examples/addons/assimpExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofSetLogLevel(OF_LOG_VERBOSE);
     ofBackground(50, 0);
 
@@ -29,7 +29,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     model.update();
     
     if(bAnimateMouse) {
@@ -40,7 +40,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofSetColor(255);
 
     ofPushMatrix();
@@ -89,7 +89,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     ofPoint modelPosition(ofGetWidth() * 0.5, (float)ofGetHeight() * 0.75);
     switch (key) {
         case '1':
@@ -136,23 +136,23 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
     //
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
     // scrub through aninations manually.
 	animationPosition = y / (float)ofGetHeight();
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     // pause all animations, so we can scrub through them manually.
     model.setPausedForAllAnimations(true);
 	animationPosition = y / (float)ofGetHeight();
@@ -160,7 +160,7 @@ void testApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     // unpause animations when finished scrubbing.
     if(bAnimate) {
         model.setPausedForAllAnimations(false);
@@ -169,17 +169,17 @@ void testApp::mouseReleased(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
 
diff --git a/examples/addons/assimpExample/src/testApp.h b/examples/addons/assimpExample/src/ofApp.h
similarity index 95%
rename from examples/addons/assimpExample/src/testApp.h
rename to examples/addons/assimpExample/src/ofApp.h
index 4e3ec8f8fbd..2255c99ffee 100644
--- a/examples/addons/assimpExample/src/testApp.h
+++ b/examples/addons/assimpExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofxAssimpModelLoader.h"
 #include "ofVboMesh.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/addons/kinectExample/src/main.cpp b/examples/addons/kinectExample/src/main.cpp
index 1ed6e576563..d134fc9d651 100644
--- a/examples/addons/kinectExample/src/main.cpp
+++ b/examples/addons/kinectExample/src/main.cpp
@@ -1,6 +1,6 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 int main() {
     ofSetupOpenGL(1024, 768, OF_WINDOW);
-	ofRunApp(new testApp());
+	ofRunApp(new ofApp());
 }
diff --git a/examples/addons/kinectExample/src/testApp.cpp b/examples/addons/kinectExample/src/ofApp.cpp
similarity index 94%
rename from examples/addons/kinectExample/src/testApp.cpp
rename to examples/addons/kinectExample/src/ofApp.cpp
index f1e0c48b290..2a66f89f63d 100644
--- a/examples/addons/kinectExample/src/testApp.cpp
+++ b/examples/addons/kinectExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	ofSetLogLevel(OF_LOG_VERBOSE);
 	
 	// enable depth->video image calibration
@@ -49,7 +49,7 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	
 	ofBackground(100, 100, 100);
 	
@@ -98,7 +98,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	
 	ofSetColor(255, 255, 255);
 	
@@ -148,7 +148,7 @@ void testApp::draw() {
     
 }
 
-void testApp::drawPointCloud() {
+void ofApp::drawPointCloud() {
 	int w = 640;
 	int h = 480;
 	ofMesh mesh;
@@ -174,7 +174,7 @@ void testApp::drawPointCloud() {
 }
 
 //--------------------------------------------------------------
-void testApp::exit() {
+void ofApp::exit() {
 	kinect.setCameraTiltAngle(0); // zero the tilt on exit
 	kinect.close();
 	
@@ -184,7 +184,7 @@ void testApp::exit() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed (int key) {
+void ofApp::keyPressed (int key) {
 	switch (key) {
 		case ' ':
 			bThreshWithOpenCV = !bThreshWithOpenCV;
@@ -270,17 +270,17 @@ void testApp::keyPressed (int key) {
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button)
+void ofApp::mouseDragged(int x, int y, int button)
 {}
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button)
+void ofApp::mousePressed(int x, int y, int button)
 {}
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button)
+void ofApp::mouseReleased(int x, int y, int button)
 {}
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h)
+void ofApp::windowResized(int w, int h)
 {}
diff --git a/examples/addons/kinectExample/src/testApp.h b/examples/addons/kinectExample/src/ofApp.h
similarity index 96%
rename from examples/addons/kinectExample/src/testApp.h
rename to examples/addons/kinectExample/src/ofApp.h
index 9b2fc1fa57c..b69db5a09cb 100644
--- a/examples/addons/kinectExample/src/testApp.h
+++ b/examples/addons/kinectExample/src/ofApp.h
@@ -7,7 +7,7 @@
 // uncomment this to read from two kinects simultaneously
 //#define USE_TWO_KINECTS
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 public:
 	
 	void setup();
diff --git a/examples/addons/networkTcpClientExample/src/main.cpp b/examples/addons/networkTcpClientExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/addons/networkTcpClientExample/src/main.cpp
+++ b/examples/addons/networkTcpClientExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/networkTcpClientExample/src/testApp.cpp b/examples/addons/networkTcpClientExample/src/ofApp.cpp
similarity index 85%
rename from examples/addons/networkTcpClientExample/src/testApp.cpp
rename to examples/addons/networkTcpClientExample/src/ofApp.cpp
index c51d15371a3..8f6402d82d7 100644
--- a/examples/addons/networkTcpClientExample/src/testApp.cpp
+++ b/examples/addons/networkTcpClientExample/src/ofApp.cpp
@@ -1,9 +1,9 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 #define RECONNECT_TIME 400
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	// we don't want to be running to fast
 	ofSetVerticalSync(true);
@@ -33,7 +33,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(230, 230, 230);
 
 	//we are connected - lets send our text and check what we get back
@@ -61,7 +61,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetColor(20, 20, 20);
 	ofDrawBitmapString("openFrameworks TCP Send Example", 15, 30);
@@ -81,7 +81,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 	//you can only type if you're connected
 	if(weConnected){
@@ -99,42 +99,42 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/networkTcpClientExample/src/testApp.h b/examples/addons/networkTcpClientExample/src/ofApp.h
similarity index 95%
rename from examples/addons/networkTcpClientExample/src/testApp.h
rename to examples/addons/networkTcpClientExample/src/ofApp.h
index 55952d6c3d9..4deaf360c56 100644
--- a/examples/addons/networkTcpClientExample/src/testApp.h
+++ b/examples/addons/networkTcpClientExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxNetwork.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/addons/networkTcpServerExample/src/main.cpp b/examples/addons/networkTcpServerExample/src/main.cpp
index c812e54cc92..ae6da6418a1 100644
--- a/examples/addons/networkTcpServerExample/src/main.cpp
+++ b/examples/addons/networkTcpServerExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/networkTcpServerExample/src/testApp.cpp b/examples/addons/networkTcpServerExample/src/ofApp.cpp
similarity index 84%
rename from examples/addons/networkTcpServerExample/src/testApp.cpp
rename to examples/addons/networkTcpServerExample/src/ofApp.cpp
index 4fc110b7b73..bf8f5e198ed 100644
--- a/examples/addons/networkTcpServerExample/src/testApp.cpp
+++ b/examples/addons/networkTcpServerExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	//we run at 60 fps!
 	ofSetVerticalSync(true);
 
@@ -13,7 +13,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(20, 20, 20);
 
 	//for each client lets send them a message letting them know what port they are connected on
@@ -26,7 +26,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetHexColor(0xDDDDDD);
 	ofDrawBitmapString("TCP SERVER Example \n\nconnect on port: "+ofToString(TCP.getPort()), 10, 20);
@@ -76,46 +76,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/networkTcpServerExample/src/testApp.h b/examples/addons/networkTcpServerExample/src/ofApp.h
similarity index 94%
rename from examples/addons/networkTcpServerExample/src/testApp.h
rename to examples/addons/networkTcpServerExample/src/ofApp.h
index b58b202e686..3ac8ca87a81 100644
--- a/examples/addons/networkTcpServerExample/src/testApp.h
+++ b/examples/addons/networkTcpServerExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxNetwork.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/addons/networkUdpReceiverExample/src/main.cpp b/examples/addons/networkUdpReceiverExample/src/main.cpp
index c812e54cc92..ae6da6418a1 100644
--- a/examples/addons/networkUdpReceiverExample/src/main.cpp
+++ b/examples/addons/networkUdpReceiverExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/networkUdpReceiverExample/src/testApp.cpp b/examples/addons/networkUdpReceiverExample/src/ofApp.cpp
similarity index 78%
rename from examples/addons/networkUdpReceiverExample/src/testApp.cpp
rename to examples/addons/networkUdpReceiverExample/src/ofApp.cpp
index 929f39a2317..8ad3cba21b7 100644
--- a/examples/addons/networkUdpReceiverExample/src/testApp.cpp
+++ b/examples/addons/networkUdpReceiverExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	//we run at 60 fps!
 	ofSetVerticalSync(true);
 	ofSetFrameRate(60);
@@ -16,7 +16,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	char udpMessage[100000];
 	udpConnection.Receive(udpMessage,100000);
@@ -38,7 +38,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofFill();
     ofSetHexColor(0xFFFFFF);
     ofRect(0,0,200,30);
@@ -51,45 +51,45 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/networkUdpReceiverExample/src/testApp.h b/examples/addons/networkUdpReceiverExample/src/ofApp.h
similarity index 94%
rename from examples/addons/networkUdpReceiverExample/src/testApp.h
rename to examples/addons/networkUdpReceiverExample/src/ofApp.h
index 92331070748..bef01e61822 100644
--- a/examples/addons/networkUdpReceiverExample/src/testApp.h
+++ b/examples/addons/networkUdpReceiverExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxNetwork.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/addons/networkUdpSenderExample/src/main.cpp b/examples/addons/networkUdpSenderExample/src/main.cpp
index c812e54cc92..ae6da6418a1 100644
--- a/examples/addons/networkUdpSenderExample/src/main.cpp
+++ b/examples/addons/networkUdpSenderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/networkUdpSenderExample/src/testApp.cpp b/examples/addons/networkUdpSenderExample/src/ofApp.cpp
similarity index 76%
rename from examples/addons/networkUdpSenderExample/src/testApp.cpp
rename to examples/addons/networkUdpSenderExample/src/ofApp.cpp
index 025f0f8d42b..5dec2a6676a 100644
--- a/examples/addons/networkUdpSenderExample/src/testApp.cpp
+++ b/examples/addons/networkUdpSenderExample/src/ofApp.cpp
@@ -1,9 +1,9 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 #define RECONNECT_TIME 400
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	// we don't want to be running to fast
 	ofSetVerticalSync(true);
 	ofSetFrameRate(60);
@@ -17,12 +17,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetColor(20, 20, 20);
 	ofDrawBitmapString("openFrameworks UDP Send Example ", 15, 30);
@@ -34,33 +34,33 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	stroke.push_back(ofPoint(x,y));
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	stroke.clear();
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	string message="";
 	for(unsigned int i=0; i<stroke.size(); i++){
 		message+=ofToString(stroke[i].x)+"|"+ofToString(stroke[i].y)+"[/p]";
@@ -69,16 +69,16 @@ void testApp::mouseReleased(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/networkUdpSenderExample/src/testApp.h b/examples/addons/networkUdpSenderExample/src/ofApp.h
similarity index 94%
rename from examples/addons/networkUdpSenderExample/src/testApp.h
rename to examples/addons/networkUdpSenderExample/src/ofApp.h
index fef93f80433..6991579dd89 100644
--- a/examples/addons/networkUdpSenderExample/src/testApp.h
+++ b/examples/addons/networkUdpSenderExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofxNetwork.h"
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/addons/opencvExample/src/main.cpp b/examples/addons/opencvExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/addons/opencvExample/src/main.cpp
+++ b/examples/addons/opencvExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/opencvExample/src/testApp.cpp b/examples/addons/opencvExample/src/ofApp.cpp
similarity index 88%
rename from examples/addons/opencvExample/src/testApp.cpp
rename to examples/addons/opencvExample/src/ofApp.cpp
index 259be15cf43..a82a950bc7f 100644
--- a/examples/addons/opencvExample/src/testApp.cpp
+++ b/examples/addons/opencvExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	#ifdef _USE_LIVE_VIDEO
         vidGrabber.setVerbose(true);
@@ -21,7 +21,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(100,100,100);
 
     bool bNewFrame = false;
@@ -60,7 +60,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	// draw the incoming, the grayscale, the bg and the thresholded difference
 	ofSetHexColor(0xffffff);
@@ -105,7 +105,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 	switch (key){
 		case ' ':
@@ -123,41 +123,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/opencvExample/src/testApp.h b/examples/addons/opencvExample/src/ofApp.h
similarity index 96%
rename from examples/addons/opencvExample/src/testApp.h
rename to examples/addons/opencvExample/src/ofApp.h
index f46a68a1f4d..99eb379a9fd 100644
--- a/examples/addons/opencvExample/src/testApp.h
+++ b/examples/addons/opencvExample/src/ofApp.h
@@ -7,7 +7,7 @@
 //#define _USE_LIVE_VIDEO		// uncomment this to use a live camera
 								// otherwise, we'll use a movie file
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/addons/opencvHaarFinderExample/src/main.cpp b/examples/addons/opencvHaarFinderExample/src/main.cpp
index 54009297862..c8d499f3fce 100755
--- a/examples/addons/opencvHaarFinderExample/src/main.cpp
+++ b/examples/addons/opencvHaarFinderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/opencvHaarFinderExample/src/testApp.cpp b/examples/addons/opencvHaarFinderExample/src/ofApp.cpp
similarity index 66%
rename from examples/addons/opencvHaarFinderExample/src/testApp.cpp
rename to examples/addons/opencvHaarFinderExample/src/ofApp.cpp
index 49090ee653a..611d5ee8279 100755
--- a/examples/addons/opencvHaarFinderExample/src/testApp.cpp
+++ b/examples/addons/opencvHaarFinderExample/src/ofApp.cpp
@@ -1,19 +1,19 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	img.loadImage("test.jpg");
 	finder.setup("haarcascade_frontalface_default.xml");
 	finder.findHaarObjects(img);
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	img.draw(0, 0);
 	ofNoFill();
 	for(unsigned int i = 0; i < finder.blobs.size(); i++) {
@@ -23,46 +23,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/opencvHaarFinderExample/src/testApp.h b/examples/addons/opencvHaarFinderExample/src/ofApp.h
similarity index 93%
rename from examples/addons/opencvHaarFinderExample/src/testApp.h
rename to examples/addons/opencvHaarFinderExample/src/ofApp.h
index d8f7358a91c..f5a1f50da40 100755
--- a/examples/addons/opencvHaarFinderExample/src/testApp.h
+++ b/examples/addons/opencvHaarFinderExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxCvHaarFinder.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/addons/oscChatSystemExample/src/main.cpp b/examples/addons/oscChatSystemExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/addons/oscChatSystemExample/src/main.cpp
+++ b/examples/addons/oscChatSystemExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/oscChatSystemExample/src/testApp.cpp b/examples/addons/oscChatSystemExample/src/ofApp.cpp
similarity index 92%
rename from examples/addons/oscChatSystemExample/src/testApp.cpp
rename to examples/addons/oscChatSystemExample/src/ofApp.cpp
index da004d3080c..95ab146e4b7 100644
--- a/examples/addons/oscChatSystemExample/src/testApp.cpp
+++ b/examples/addons/oscChatSystemExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetFrameRate(60); // run at 60 fps
 	ofSetVerticalSync(true);
 
@@ -32,7 +32,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	// OSC receiver queues up new messages, so you need to iterate
 	// through waiting messages to get each incoming message
@@ -109,7 +109,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	//Display some information about the client on the screen with the font you loaded
 
@@ -145,7 +145,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	// if we didn't hit return, add the key to our string
 	if(key != OF_KEY_RETURN){
 		// some trickery: ignore the backspace key
@@ -173,47 +173,47 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
 
 //--------------------------------------------------------------
-string testApp::getOscMsgAsString(ofxOscMessage m){
+string ofApp::getOscMsgAsString(ofxOscMessage m){
 	string msg_string;
 	msg_string = m.getAddress();
 	msg_string += ":";
@@ -238,7 +238,7 @@ string testApp::getOscMsgAsString(ofxOscMessage m){
 	return msg_string;
 }
 
-void testApp::broadcastReceivedMessage(string chatmessage){
+void ofApp::broadcastReceivedMessage(string chatmessage){
 
 	//create a new OSC message
 	ofxOscMessage m;
diff --git a/examples/addons/oscChatSystemExample/src/testApp.h b/examples/addons/oscChatSystemExample/src/ofApp.h
similarity index 95%
rename from examples/addons/oscChatSystemExample/src/testApp.h
rename to examples/addons/oscChatSystemExample/src/ofApp.h
index fee715625c7..c06f0c2f40f 100644
--- a/examples/addons/oscChatSystemExample/src/testApp.h
+++ b/examples/addons/oscChatSystemExample/src/ofApp.h
@@ -12,12 +12,12 @@
  - it sends chat messages to a server running in the same app
  - optionally, it can talk to another instance of this app on another IP.
  - get the IP address of the second computer
- - in testApp.cpp inside the setup() function, change the value of
+ - in ofApp.cpp inside the setup() function, change the value of
  clientDestination to the other IP as shown in the comment.
 
  ***************************************************************/
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 
 	public:
 		void setup();
diff --git a/examples/addons/oscReceiveExample/src/main.cpp b/examples/addons/oscReceiveExample/src/main.cpp
index d50a844b8f8..b156efd6462 100644
--- a/examples/addons/oscReceiveExample/src/main.cpp
+++ b/examples/addons/oscReceiveExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/oscReceiveExample/src/testApp.cpp b/examples/addons/oscReceiveExample/src/ofApp.cpp
similarity index 86%
rename from examples/addons/oscReceiveExample/src/testApp.cpp
rename to examples/addons/oscReceiveExample/src/ofApp.cpp
index ebfa4fdc27d..c6bf92d5374 100644
--- a/examples/addons/oscReceiveExample/src/testApp.cpp
+++ b/examples/addons/oscReceiveExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	// listen on the given port
 	cout << "listening for osc messages on port " << PORT << "\n";
 	receiver.setup(PORT);
@@ -16,7 +16,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	// hide old messages
 	for(int i = 0; i < NUM_MSG_STRINGS; i++){
@@ -78,7 +78,7 @@ void testApp::update(){
 
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	string buf;
 	buf = "listening for osc messages on port" + ofToString(PORT);
@@ -98,45 +98,45 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/addons/oscReceiveExample/src/testApp.h b/examples/addons/oscReceiveExample/src/ofApp.h
similarity index 95%
rename from examples/addons/oscReceiveExample/src/testApp.h
rename to examples/addons/oscReceiveExample/src/ofApp.h
index 411e89ff42a..c11f0e2b91c 100644
--- a/examples/addons/oscReceiveExample/src/testApp.h
+++ b/examples/addons/oscReceiveExample/src/ofApp.h
@@ -7,7 +7,7 @@
 #define PORT 12345
 #define NUM_MSG_STRINGS 20
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 
 		void setup();
diff --git a/examples/addons/oscSenderExample/src/main.cpp b/examples/addons/oscSenderExample/src/main.cpp
index d50a844b8f8..b156efd6462 100644
--- a/examples/addons/oscSenderExample/src/main.cpp
+++ b/examples/addons/oscSenderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/oscSenderExample/src/testApp.cpp b/examples/addons/oscSenderExample/src/ofApp.cpp
similarity index 79%
rename from examples/addons/oscSenderExample/src/testApp.cpp
rename to examples/addons/oscSenderExample/src/ofApp.cpp
index 70e9d283eb7..58ab104a052 100644
--- a/examples/addons/oscSenderExample/src/testApp.cpp
+++ b/examples/addons/oscSenderExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	ofBackground(40, 100, 40);
 
@@ -10,12 +10,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	// display instructions
 	string buf;
 	buf = "sending osc messages to" + string(HOST) + ofToString(PORT);
@@ -26,7 +26,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if(key == 'a' || key == 'A'){
 		ofxOscMessage m;
 		m.setAddress("/test");
@@ -39,12 +39,12 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 	ofxOscMessage m;
 	m.setAddress("/mouse/position");
 	m.addIntArg(x);
@@ -53,12 +53,12 @@ void testApp::mouseMoved(int x, int y){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	ofxOscMessage m;
 	m.setAddress("/mouse/button");
 	m.addStringArg("down");
@@ -66,7 +66,7 @@ void testApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	ofxOscMessage m;
 	m.setAddress("/mouse/button");
 	m.addStringArg("up");
@@ -75,17 +75,17 @@ void testApp::mouseReleased(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
 
diff --git a/examples/addons/oscSenderExample/src/testApp.h b/examples/addons/oscSenderExample/src/ofApp.h
similarity index 94%
rename from examples/addons/oscSenderExample/src/testApp.h
rename to examples/addons/oscSenderExample/src/ofApp.h
index ca2bbae0389..fb723d204ef 100644
--- a/examples/addons/oscSenderExample/src/testApp.h
+++ b/examples/addons/oscSenderExample/src/ofApp.h
@@ -7,7 +7,7 @@
 #define PORT 12345
 
 //--------------------------------------------------------
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 
 	public:
 
diff --git a/examples/addons/svgExample/src/main.cpp b/examples/addons/svgExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/addons/svgExample/src/main.cpp
+++ b/examples/addons/svgExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/svgExample/src/testApp.cpp b/examples/addons/svgExample/src/ofApp.cpp
similarity index 79%
rename from examples/addons/svgExample/src/testApp.cpp
rename to examples/addons/svgExample/src/ofApp.cpp
index 0ebf459e91e..735ca05f345 100644
--- a/examples/addons/svgExample/src/testApp.cpp
+++ b/examples/addons/svgExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	
 	ofBackground(0);
@@ -21,7 +21,7 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	step += 0.001;
 	if (step > 1) {
 		step -= 1;
@@ -29,7 +29,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofDrawBitmapString(ofToString(ofGetFrameRate()),20,20);
 	ofPushMatrix();
 	ofTranslate(ofGetWidth() / 2, ofGetHeight() / 2);
@@ -58,46 +58,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 	
 }
diff --git a/examples/addons/svgExample/src/testApp.h b/examples/addons/svgExample/src/ofApp.h
similarity index 94%
rename from examples/addons/svgExample/src/testApp.h
rename to examples/addons/svgExample/src/ofApp.h
index a93b15af0f3..25e64f912ef 100644
--- a/examples/addons/svgExample/src/testApp.h
+++ b/examples/addons/svgExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxSvg.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
     
 public:
     void setup();
diff --git a/examples/addons/threadedImageLoaderExample/src/main.cpp b/examples/addons/threadedImageLoaderExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/addons/threadedImageLoaderExample/src/main.cpp
+++ b/examples/addons/threadedImageLoaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/threadedImageLoaderExample/src/testApp.cpp b/examples/addons/threadedImageLoaderExample/src/ofApp.cpp
similarity index 74%
rename from examples/addons/threadedImageLoaderExample/src/testApp.cpp
rename to examples/addons/threadedImageLoaderExample/src/ofApp.cpp
index f09987585db..cec6269b199 100644
--- a/examples/addons/threadedImageLoaderExample/src/testApp.cpp
+++ b/examples/addons/threadedImageLoaderExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetLogLevel(OF_LOG_VERBOSE);
 	ofSetVerticalSync(true);
 	total = 24;
@@ -13,12 +13,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){	
+void ofApp::draw(){	
 	
 	// draw the images.
 	ofSetColor(255);
@@ -36,51 +36,51 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 	loader.stopThread();
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/threadedImageLoaderExample/src/testApp.h b/examples/addons/threadedImageLoaderExample/src/ofApp.h
similarity index 94%
rename from examples/addons/threadedImageLoaderExample/src/testApp.h
rename to examples/addons/threadedImageLoaderExample/src/ofApp.h
index 9362ee0d021..c4ba01ceb09 100644
--- a/examples/addons/threadedImageLoaderExample/src/testApp.h
+++ b/examples/addons/threadedImageLoaderExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxThreadedImageLoader.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/addons/vectorGraphicsExample/src/main.cpp b/examples/addons/vectorGraphicsExample/src/main.cpp
index 1ecea0e6e6c..5e44298df02 100644
--- a/examples/addons/vectorGraphicsExample/src/main.cpp
+++ b/examples/addons/vectorGraphicsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/vectorGraphicsExample/src/testApp.cpp b/examples/addons/vectorGraphicsExample/src/ofApp.cpp
similarity index 94%
rename from examples/addons/vectorGraphicsExample/src/testApp.cpp
rename to examples/addons/vectorGraphicsExample/src/ofApp.cpp
index 7dd099b1b7f..0acfdd813ae 100644
--- a/examples/addons/vectorGraphicsExample/src/testApp.cpp
+++ b/examples/addons/vectorGraphicsExample/src/ofApp.cpp
@@ -1,20 +1,20 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	capture = false;
 	bFill	= true;
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(255, 255, 255);
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	//we don't want to capture every frame
 	//so we only capture one frame when capture
@@ -320,7 +320,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if(key == ' '){
 		capture = true;
 	}else if(key =='f'){
@@ -329,17 +329,17 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 	//we add a new point to our line
 	pts.push_back(ofPoint());
@@ -351,7 +351,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	pts.clear();
 
 	//lets store the first point of the line
@@ -363,21 +363,21 @@ void testApp::mousePressed(int x, int y, int button){
 
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/addons/vectorGraphicsExample/src/testApp.h b/examples/addons/vectorGraphicsExample/src/ofApp.h
similarity index 94%
rename from examples/addons/vectorGraphicsExample/src/testApp.h
rename to examples/addons/vectorGraphicsExample/src/ofApp.h
index 758a366b1cf..7930f2cdd19 100644
--- a/examples/addons/vectorGraphicsExample/src/testApp.h
+++ b/examples/addons/vectorGraphicsExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofxVectorGraphics.h"
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/addons/xmlSettingsExample/src/main.cpp b/examples/addons/xmlSettingsExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/addons/xmlSettingsExample/src/main.cpp
+++ b/examples/addons/xmlSettingsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/addons/xmlSettingsExample/src/testApp.cpp b/examples/addons/xmlSettingsExample/src/ofApp.cpp
similarity index 93%
rename from examples/addons/xmlSettingsExample/src/testApp.cpp
rename to examples/addons/xmlSettingsExample/src/ofApp.cpp
index 80a12366510..4ebd0dbaca6 100644
--- a/examples/addons/xmlSettingsExample/src/testApp.cpp
+++ b/examples/addons/xmlSettingsExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
     ofDisableAntiAliasing();
 
@@ -92,7 +92,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//we change the background color here based on the values
 	//affected by the mouse position
 	ofBackground((int)red,(int)green,(int)blue);
@@ -100,7 +100,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	//---------
 	//Lets draw the stroke as a continous line
@@ -147,7 +147,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 
 		//no data gets saved unless you hit the s key
 		if(key == 's'){
@@ -157,17 +157,17 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 	//-------
 	//we change the background color based on
@@ -227,7 +227,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     
     //reset so we don't store extra tags
     XML.clear();
@@ -246,7 +246,7 @@ void testApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 	//update the colors to the XML structure when the mouse is released
 	XML.setValue("BACKGROUND:COLOR:RED", red);
@@ -257,17 +257,17 @@ void testApp::mouseReleased(int x, int y, int button){
 
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
 
diff --git a/examples/addons/xmlSettingsExample/src/testApp.h b/examples/addons/xmlSettingsExample/src/ofApp.h
similarity index 95%
rename from examples/addons/xmlSettingsExample/src/testApp.h
rename to examples/addons/xmlSettingsExample/src/ofApp.h
index 8c4220588c5..76f7aa4eda9 100644
--- a/examples/addons/xmlSettingsExample/src/testApp.h
+++ b/examples/addons/xmlSettingsExample/src/ofApp.h
@@ -5,7 +5,7 @@
 
 #define NUM_PTS 800
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/android/android3DModelLoaderExample/src/main.cpp b/examples/android/android3DModelLoaderExample/src/main.cpp
index 2f5b3b93684..7b91b3e61c2 100644
--- a/examples/android/android3DModelLoaderExample/src/main.cpp
+++ b/examples/android/android3DModelLoaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -8,7 +8,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/android3DModelLoaderExample/src/testApp.cpp b/examples/android/android3DModelLoaderExample/src/ofApp.cpp
similarity index 84%
rename from examples/android/android3DModelLoaderExample/src/testApp.cpp
rename to examples/android/android3DModelLoaderExample/src/ofApp.cpp
index 5ba7fdf2201..4675a0af6c9 100644
--- a/examples/android/android3DModelLoaderExample/src/testApp.cpp
+++ b/examples/android/android3DModelLoaderExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 GLfloat lightOnePosition[] = {40.0, 40, 100.0, 0.0};
 GLfloat lightOneColor[] = {0.99, 0.99, 0.99, 1.0};
@@ -7,7 +7,7 @@ GLfloat lightTwoPosition[] = {-40.0, 40, 100.0, 0.0};
 GLfloat lightTwoColor[] = {0.99, 0.99, 0.99, 1.0};
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
 
     //some model / light stuff
@@ -39,12 +39,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     squirrelModel.setRotation(1, 270 + ofGetElapsedTimef() * 60, 0, 0, 1);
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	 //fake back wall
    ofSetColor(20, 20, 20);
 
@@ -89,81 +89,81 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/android3DModelLoaderExample/src/testApp.h b/examples/android/android3DModelLoaderExample/src/ofApp.h
similarity index 94%
rename from examples/android/android3DModelLoaderExample/src/testApp.h
rename to examples/android/android3DModelLoaderExample/src/ofApp.h
index e9d12003425..6c4a3a80424 100644
--- a/examples/android/android3DModelLoaderExample/src/testApp.h
+++ b/examples/android/android3DModelLoaderExample/src/ofApp.h
@@ -6,7 +6,7 @@
 
 #include <GLES/gl.h>
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidAccelerometerExample/src/main.cpp b/examples/android/androidAccelerometerExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidAccelerometerExample/src/main.cpp
+++ b/examples/android/androidAccelerometerExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidAccelerometerExample/src/testApp.cpp b/examples/android/androidAccelerometerExample/src/ofApp.cpp
similarity index 76%
rename from examples/android/androidAccelerometerExample/src/testApp.cpp
rename to examples/android/androidAccelerometerExample/src/ofApp.cpp
index f1685d1b670..cd154cfabf7 100644
--- a/examples/android/androidAccelerometerExample/src/testApp.cpp
+++ b/examples/android/androidAccelerometerExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	// initialize the accelerometer
 	ofxAccelerometer.setup();
 
@@ -11,7 +11,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	accel = ofxAccelerometer.getForce();
 	messages[0] = "g(x) = " + ofToString(accel.x,2);
 	messages[1] = "g(y) = " + ofToString(accel.y,2);
@@ -20,7 +20,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetColor(255,255,0);
 	font.drawString(messages[0],10,font.stringHeight(messages[0])+20);
 	ofSetColor(255,0,255);
@@ -42,81 +42,81 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidAccelerometerExample/src/testApp.h b/examples/android/androidAccelerometerExample/src/ofApp.h
similarity index 95%
rename from examples/android/androidAccelerometerExample/src/testApp.h
rename to examples/android/androidAccelerometerExample/src/ofApp.h
index bab45eb6f76..50acf035441 100644
--- a/examples/android/androidAccelerometerExample/src/testApp.h
+++ b/examples/android/androidAccelerometerExample/src/ofApp.h
@@ -5,7 +5,7 @@
 
 #include "ofxAccelerometer.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidAdvanced3DExample/src/main.cpp b/examples/android/androidAdvanced3DExample/src/main.cpp
index f29795ec03f..715204d66bb 100644
--- a/examples/android/androidAdvanced3DExample/src/main.cpp
+++ b/examples/android/androidAdvanced3DExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 
 
@@ -9,7 +9,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidAdvanced3DExample/src/testApp.cpp b/examples/android/androidAdvanced3DExample/src/ofApp.cpp
similarity index 92%
rename from examples/android/androidAdvanced3DExample/src/testApp.cpp
rename to examples/android/androidAdvanced3DExample/src/ofApp.cpp
index ae19bc614a9..0b315820bba 100644
--- a/examples/android/androidAdvanced3DExample/src/testApp.cpp
+++ b/examples/android/androidAdvanced3DExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 ///////////////////////////////////////////////////
 ///////////////////////////////////////////////
@@ -38,7 +38,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	ofSetVerticalSync(true);
 	ofBackground(70, 70, 70);
@@ -96,7 +96,7 @@ void testApp::setup(){
 
 //--------------------------------------------------------------
 
-void testApp::setupViewports()
+void ofApp::setupViewports()
 {
 	//call here whenever we resize the window
 	
@@ -124,13 +124,13 @@ void testApp::setupViewports()
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	ofDrawBitmapString("test", 10, 10);
 	
@@ -211,7 +211,7 @@ void testApp::draw(){
 	//////////////////////////
 }
 
-void testApp::drawScene(int iCameraDraw){	
+void ofApp::drawScene(int iCameraDraw){	
 	
 	nodeSwarm.draw();
 	nodeGrid.draw();
@@ -367,7 +367,7 @@ void testApp::drawScene(int iCameraDraw){
 
 //--------------------------------------------------------------
 
-void testApp::updateMouseRay()
+void ofApp::updateMouseRay()
 {
 	
 	//define ray in screen space
@@ -380,7 +380,7 @@ void testApp::updateMouseRay()
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 	if (key >= '1' && key <= '4')
 		iMainCamera = key - '1';
@@ -408,77 +408,77 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	setupViewports();
 }
 
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidAdvanced3DExample/src/testApp.h b/examples/android/androidAdvanced3DExample/src/ofApp.h
similarity index 98%
rename from examples/android/androidAdvanced3DExample/src/testApp.h
rename to examples/android/androidAdvanced3DExample/src/ofApp.h
index e0af6c6339b..b39bd083d75 100644
--- a/examples/android/androidAdvanced3DExample/src/testApp.h
+++ b/examples/android/androidAdvanced3DExample/src/ofApp.h
@@ -27,7 +27,7 @@
 
 #define N_CAMERAS 4
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 
 	public:
 		void setup();
diff --git a/examples/android/androidAssimpExample/src/main.cpp b/examples/android/androidAssimpExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidAssimpExample/src/main.cpp
+++ b/examples/android/androidAssimpExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidAssimpExample/src/testApp.cpp b/examples/android/androidAssimpExample/src/ofApp.cpp
similarity index 81%
rename from examples/android/androidAssimpExample/src/testApp.cpp
rename to examples/android/androidAssimpExample/src/ofApp.cpp
index b548f582005..e0a9a8b87c7 100644
--- a/examples/android/androidAssimpExample/src/testApp.cpp
+++ b/examples/android/androidAssimpExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofBackground(50, 0);
 
     bAnimate = false;
@@ -28,7 +28,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     model.update();
     
     if(bAnimateMouse) {
@@ -39,7 +39,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofSetColor(255);
 
     ofPushMatrix();
@@ -81,24 +81,24 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
     //
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
     // scrub through aninations manually.
 	animationPosition = y / (float)ofGetHeight();
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
     // pause all animations, so we can scrub through them manually.
     model.setPausedForAllAnimations(true);
 	animationPosition = y / (float)ofGetHeight();
@@ -106,7 +106,7 @@ void testApp::touchDown(int x, int y, int id){
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
     // unpause animations when finished scrubbing.
     if(bAnimate) {
         model.setPausedForAllAnimations(false);
@@ -114,48 +114,48 @@ void testApp::touchUp(int x, int y, int id){
     bAnimateMouse = false;
 }
 
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 }
 
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
diff --git a/examples/android/androidAssimpExample/src/testApp.h b/examples/android/androidAssimpExample/src/ofApp.h
similarity index 95%
rename from examples/android/androidAssimpExample/src/testApp.h
rename to examples/android/androidAssimpExample/src/ofApp.h
index e2f9ca417ff..003ed966ff0 100644
--- a/examples/android/androidAssimpExample/src/testApp.h
+++ b/examples/android/androidAssimpExample/src/ofApp.h
@@ -6,7 +6,7 @@
 #include "ofxAssimpModelLoader.h"
 #include "ofVboMesh.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 
 	public:
 		void setup();
diff --git a/examples/android/androidAudioExample/src/main.cpp b/examples/android/androidAudioExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidAudioExample/src/main.cpp
+++ b/examples/android/androidAudioExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidAudioExample/src/testApp.cpp b/examples/android/androidAudioExample/src/ofApp.cpp
similarity index 79%
rename from examples/android/androidAudioExample/src/testApp.cpp
rename to examples/android/androidAudioExample/src/ofApp.cpp
index b613bb24352..4731c4f8d8f 100644
--- a/examples/android/androidAudioExample/src/testApp.cpp
+++ b/examples/android/androidAudioExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
 	ofSetColor(0,0,0);
 	ofSetLogLevel(OF_LOG_NOTICE);
@@ -19,12 +19,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	// draw the left:
 	ofFill();
 	ofSetHexColor(0x333333);
@@ -51,27 +51,27 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 	int width = ofGetWidth();
 	pan = (float)x / (float)width;
 	float height = (float)ofGetHeight();
@@ -81,62 +81,62 @@ void testApp::touchMoved(int x, int y, int id){
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
 
 
-void testApp::audioRequested(float * output,int bufferSize,int nChannels){
+void ofApp::audioRequested(float * output,int bufferSize,int nChannels){
 	//pan = 0.5f;
 	float leftScale = 1 - pan;
 	float rightScale = pan;
@@ -165,7 +165,7 @@ void testApp::audioRequested(float * output,int bufferSize,int nChannels){
 	}
 }
 
-void testApp::audioReceived(float * input,int bufferSize,int nChannels){
+void ofApp::audioReceived(float * input,int bufferSize,int nChannels){
 	for (int i = 0; i < bufferSize; i++){
 		rAudio[i%256] = input[i*nChannels ] + input[i*nChannels +1] ;
 	}
diff --git a/examples/android/androidAudioExample/src/testApp.h b/examples/android/androidAudioExample/src/ofApp.h
similarity index 96%
rename from examples/android/androidAudioExample/src/testApp.h
rename to examples/android/androidAudioExample/src/ofApp.h
index 47be730773a..ba2d53eec7d 100644
--- a/examples/android/androidAudioExample/src/testApp.h
+++ b/examples/android/androidAudioExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxAndroid.h"
 #include <map>
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidCameraExample/src/main.cpp b/examples/android/androidCameraExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidCameraExample/src/main.cpp
+++ b/examples/android/androidCameraExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidCameraExample/src/testApp.cpp b/examples/android/androidCameraExample/src/ofApp.cpp
similarity index 74%
rename from examples/android/androidCameraExample/src/testApp.cpp
rename to examples/android/androidCameraExample/src/ofApp.cpp
index ba273bc9825..6f6ac3dadfb 100644
--- a/examples/android/androidCameraExample/src/testApp.cpp
+++ b/examples/android/androidCameraExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofxAndroidVideoGrabber.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
 	ofSetLogLevel(OF_LOG_NOTICE);
 	ofSetOrientation(OF_ORIENTATION_90_LEFT);
@@ -14,7 +14,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	grabber.update();
 	if(grabber.isFrameNew()){
 		frames_one_sec++;
@@ -27,7 +27,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetHexColor(0xFFFFFF);
 	grabber.draw(20,20);
 	ofSetHexColor(0x000000);
@@ -36,81 +36,81 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidCameraExample/src/testApp.h b/examples/android/androidCameraExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidCameraExample/src/testApp.h
rename to examples/android/androidCameraExample/src/ofApp.h
index 683c9f29ccc..6f2a6af9512 100644
--- a/examples/android/androidCameraExample/src/testApp.h
+++ b/examples/android/androidCameraExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxAndroid.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidEmptyExample/src/main.cpp b/examples/android/androidEmptyExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidEmptyExample/src/main.cpp
+++ b/examples/android/androidEmptyExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidEmptyExample/src/testApp.cpp b/examples/android/androidEmptyExample/src/ofApp.cpp
similarity index 65%
rename from examples/android/androidEmptyExample/src/testApp.cpp
rename to examples/android/androidEmptyExample/src/ofApp.cpp
index cd90e354562..189c4aebe88 100644
--- a/examples/android/androidEmptyExample/src/testApp.cpp
+++ b/examples/android/androidEmptyExample/src/ofApp.cpp
@@ -1,96 +1,96 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidEmptyExample/src/testApp.h b/examples/android/androidEmptyExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidEmptyExample/src/testApp.h
rename to examples/android/androidEmptyExample/src/ofApp.h
index 680bc6acec9..2fe90435ddb 100644
--- a/examples/android/androidEmptyExample/src/testApp.h
+++ b/examples/android/androidEmptyExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxAndroid.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidFontExample/src/main.cpp b/examples/android/androidFontExample/src/main.cpp
index e53bb936e0a..f6605cadc78 100644
--- a/examples/android/androidFontExample/src/main.cpp
+++ b/examples/android/androidFontExample/src/main.cpp
@@ -1,12 +1,12 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
 
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidFontExample/src/testApp.cpp b/examples/android/androidFontExample/src/ofApp.cpp
similarity index 68%
rename from examples/android/androidFontExample/src/testApp.cpp
rename to examples/android/androidFontExample/src/ofApp.cpp
index dcee45b7ae6..a68819a19cb 100644
--- a/examples/android/androidFontExample/src/testApp.cpp
+++ b/examples/android/androidFontExample/src/ofApp.cpp
@@ -1,100 +1,100 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	font.loadFont("frabk.ttf",14);
 	ofBackground(255,255,255);
 	ofSetColor(0,0,0);
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	font.drawString("hello world!!",20,20);
 	//ofDrawBitmapString(ofToString(ofGetFrameRate()),20,30);
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidFontExample/src/testApp.h b/examples/android/androidFontExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidFontExample/src/testApp.h
rename to examples/android/androidFontExample/src/ofApp.h
index f98428cc4de..fe4100361f3 100644
--- a/examples/android/androidFontExample/src/testApp.h
+++ b/examples/android/androidFontExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxAndroid.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidGuiExample/src/main.cpp b/examples/android/androidGuiExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidGuiExample/src/main.cpp
+++ b/examples/android/androidGuiExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidGuiExample/src/testApp.cpp b/examples/android/androidGuiExample/src/ofApp.cpp
similarity index 76%
rename from examples/android/androidGuiExample/src/testApp.cpp
rename to examples/android/androidGuiExample/src/ofApp.cpp
index 98ae54d21c9..7306197778b 100644
--- a/examples/android/androidGuiExample/src/testApp.cpp
+++ b/examples/android/androidGuiExample/src/ofApp.cpp
@@ -1,13 +1,13 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 	
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	
 	// we add this listener before setting up so the initial circle resolution is correct
-	circleResolution.addListener(this, &testApp::circleResolutionChanged);
-	ringButton.addListener(this,&testApp::ringButtonPressed);
+	circleResolution.addListener(this, &ofApp::circleResolutionChanged);
+	ringButton.addListener(this,&ofApp::ringButtonPressed);
 
 	// change default sizes for ofxGui so it's usable in small/high density screens
 	ofxGuiSetFont("Questrial-Regular.ttf",18,true,true);
@@ -31,26 +31,26 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
-	ringButton.removeListener(this,&testApp::ringButtonPressed);
+void ofApp::exit(){
+	ringButton.removeListener(this,&ofApp::ringButtonPressed);
 }
 
 //--------------------------------------------------------------
-void testApp::circleResolutionChanged(int & circleResolution){
+void ofApp::circleResolutionChanged(int & circleResolution){
 	ofSetCircleResolution(circleResolution);
 }
 
 //--------------------------------------------------------------
-void testApp::ringButtonPressed(){
+void ofApp::ringButtonPressed(){
 	ring.play();
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackgroundGradient(ofColor::white, ofColor::gray);
     
 	if( filled ){
@@ -73,7 +73,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if( key == 'h' ){
 		bHide = !bHide;
 	}
@@ -89,40 +89,40 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
     screenSize = ofToString(w) + "x" + ofToString(h);
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/android/androidGuiExample/src/testApp.h b/examples/android/androidGuiExample/src/ofApp.h
similarity index 96%
rename from examples/android/androidGuiExample/src/testApp.h
rename to examples/android/androidGuiExample/src/ofApp.h
index e52f933ff30..b0dfae516ad 100644
--- a/examples/android/androidGuiExample/src/testApp.h
+++ b/examples/android/androidGuiExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxGui.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 public:
 	void setup();
diff --git a/examples/android/androidImageExample/src/main.cpp b/examples/android/androidImageExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidImageExample/src/main.cpp
+++ b/examples/android/androidImageExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidImageExample/src/testApp.cpp b/examples/android/androidImageExample/src/ofApp.cpp
similarity index 67%
rename from examples/android/androidImageExample/src/testApp.cpp
rename to examples/android/androidImageExample/src/ofApp.cpp
index ee0d894aa1f..89c4c649f3a 100644
--- a/examples/android/androidImageExample/src/testApp.cpp
+++ b/examples/android/androidImageExample/src/ofApp.cpp
@@ -1,97 +1,97 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	image.loadImage("images/bikers.jpg");
 	ofBackground(255,255,255);
 	ofSetColor(255,255,255);
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	image.draw(20,20);
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidImageExample/src/testApp.h b/examples/android/androidImageExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidImageExample/src/testApp.h
rename to examples/android/androidImageExample/src/ofApp.h
index 49e5b3d102a..40fa3cf93e2 100644
--- a/examples/android/androidImageExample/src/testApp.h
+++ b/examples/android/androidImageExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxAndroid.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidOpenCVExample/src/main.cpp b/examples/android/androidOpenCVExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidOpenCVExample/src/main.cpp
+++ b/examples/android/androidOpenCVExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidOpenCVExample/src/testApp.cpp b/examples/android/androidOpenCVExample/src/ofApp.cpp
similarity index 78%
rename from examples/android/androidOpenCVExample/src/testApp.cpp
rename to examples/android/androidOpenCVExample/src/ofApp.cpp
index 797774c2d30..1c5cf4716ad 100644
--- a/examples/android/androidOpenCVExample/src/testApp.cpp
+++ b/examples/android/androidOpenCVExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
 	ofSetLogLevel(OF_LOG_NOTICE);
 	ofSetOrientation(OF_ORIENTATION_90_LEFT);
@@ -19,7 +19,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	grabber.update();
 	if(grabber.isFrameNew()){
 		frames_one_sec++;
@@ -41,7 +41,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetHexColor(0xFFFFFF);
 	gray.draw(5,5);
 	contourFinder.draw(5,5);
@@ -51,81 +51,81 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidOpenCVExample/src/testApp.h b/examples/android/androidOpenCVExample/src/ofApp.h
similarity index 95%
rename from examples/android/androidOpenCVExample/src/testApp.h
rename to examples/android/androidOpenCVExample/src/ofApp.h
index 58235534899..96abbede7ad 100644
--- a/examples/android/androidOpenCVExample/src/testApp.h
+++ b/examples/android/androidOpenCVExample/src/ofApp.h
@@ -5,7 +5,7 @@
 
 #include "ofxOpenCv.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidOpenCVFaceExample/src/main.cpp b/examples/android/androidOpenCVFaceExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidOpenCVFaceExample/src/main.cpp
+++ b/examples/android/androidOpenCVFaceExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidOpenCVFaceExample/src/testApp.cpp b/examples/android/androidOpenCVFaceExample/src/ofApp.cpp
similarity index 80%
rename from examples/android/androidOpenCVFaceExample/src/testApp.cpp
rename to examples/android/androidOpenCVFaceExample/src/ofApp.cpp
index 3d2d204871e..2043a1dbb58 100644
--- a/examples/android/androidOpenCVFaceExample/src/testApp.cpp
+++ b/examples/android/androidOpenCVFaceExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
 	ofSetLogLevel(OF_LOG_NOTICE);
 	ofSetOrientation(OF_ORIENTATION_90_LEFT);
@@ -24,7 +24,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	grabber.update();
 	if(grabber.isFrameNew()){
 		frames_one_sec++;
@@ -42,7 +42,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetHexColor(0xFFFFFF);
 
 	grabber.draw(0, 0);
@@ -64,81 +64,81 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidOpenCVFaceExample/src/testApp.h b/examples/android/androidOpenCVFaceExample/src/ofApp.h
similarity index 95%
rename from examples/android/androidOpenCVFaceExample/src/testApp.h
rename to examples/android/androidOpenCVFaceExample/src/ofApp.h
index 31fae0709e2..8128b7390b6 100644
--- a/examples/android/androidOpenCVFaceExample/src/testApp.h
+++ b/examples/android/androidOpenCVFaceExample/src/ofApp.h
@@ -6,7 +6,7 @@
 #include "ofxOpenCv.h"
 #include <vector>
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidPolygonExample/src/main.cpp b/examples/android/androidPolygonExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidPolygonExample/src/main.cpp
+++ b/examples/android/androidPolygonExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidPolygonExample/src/testApp.cpp b/examples/android/androidPolygonExample/src/ofApp.cpp
similarity index 94%
rename from examples/android/androidPolygonExample/src/testApp.cpp
rename to examples/android/androidPolygonExample/src/ofApp.cpp
index 08f99253677..8a665154ce4 100644
--- a/examples/android/androidPolygonExample/src/testApp.cpp
+++ b/examples/android/androidPolygonExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	//ofSetOrientation(OF_ORIENTATION_90_RIGHT);
 	
 	//this is to scale down the example for the iphone screen
@@ -37,12 +37,12 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofScale(appIphoneScale, appIphoneScale, 1.0);
 
@@ -410,22 +410,22 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 	if( id == 0 ){
 		for (int i = 0; i < nCurveVertices; i++){
 			float diffx = x/appIphoneScale - curveVertices[i].x;
@@ -441,7 +441,7 @@ void testApp::touchDown(int x, int y, int id){
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 	if( id == 0 ){
 		for (int i = 0; i < nCurveVertices; i++){
 			if (curveVertices[i].bBeingDragged == true){
@@ -453,7 +453,7 @@ void testApp::touchMoved(int x, int y, int id){
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 	if( id == 0 ){
 		for (int i = 0; i < nCurveVertices; i++){
 			curveVertices[i].bBeingDragged = false;
@@ -462,51 +462,51 @@ void testApp::touchUp(int x, int y, int id){
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidPolygonExample/src/testApp.h b/examples/android/androidPolygonExample/src/ofApp.h
similarity index 95%
rename from examples/android/androidPolygonExample/src/testApp.h
rename to examples/android/androidPolygonExample/src/ofApp.h
index 4eeb0c031d1..1476d7dcc5d 100644
--- a/examples/android/androidPolygonExample/src/testApp.h
+++ b/examples/android/androidPolygonExample/src/ofApp.h
@@ -14,7 +14,7 @@ typedef struct {
 }	draggableVertex;
 
 
-class testApp : public ofxAndroidApp {
+class ofApp : public ofxAndroidApp {
 	
 public:
 	void setup();
diff --git a/examples/android/androidShaderExample/src/main.cpp b/examples/android/androidShaderExample/src/main.cpp
index cd0a4135fa5..f8231811266 100644
--- a/examples/android/androidShaderExample/src/main.cpp
+++ b/examples/android/androidShaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofGLProgrammableRenderer.h"
 
 int main(){
@@ -9,7 +9,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidShaderExample/src/testApp.cpp b/examples/android/androidShaderExample/src/ofApp.cpp
similarity index 77%
rename from examples/android/androidShaderExample/src/testApp.cpp
rename to examples/android/androidShaderExample/src/ofApp.cpp
index 8b1eb5142f6..8e096ead7fd 100644
--- a/examples/android/androidShaderExample/src/testApp.cpp
+++ b/examples/android/androidShaderExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetLogLevel(OF_LOG_VERBOSE);
 	ofBackground(34, 34, 34);
 	ofSetVerticalSync(false);
@@ -15,12 +15,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetColor(225);
 
@@ -48,81 +48,81 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 	doShader = true;
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 	doShader = false;
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 };
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 };
diff --git a/examples/android/androidShaderExample/src/testApp.h b/examples/android/androidShaderExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidShaderExample/src/testApp.h
rename to examples/android/androidShaderExample/src/ofApp.h
index 0062ac7b3b6..5c1ea1b2aa4 100644
--- a/examples/android/androidShaderExample/src/testApp.h
+++ b/examples/android/androidShaderExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofMain.h"
 #include "ofxAndroid.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidSoundPlayerExample/src/main.cpp b/examples/android/androidSoundPlayerExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidSoundPlayerExample/src/main.cpp
+++ b/examples/android/androidSoundPlayerExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidSoundPlayerExample/src/testApp.cpp b/examples/android/androidSoundPlayerExample/src/ofApp.cpp
similarity index 84%
rename from examples/android/androidSoundPlayerExample/src/testApp.cpp
rename to examples/android/androidSoundPlayerExample/src/ofApp.cpp
index cf410fcf370..9f8f1c12bd2 100644
--- a/examples/android/androidSoundPlayerExample/src/testApp.cpp
+++ b/examples/android/androidSoundPlayerExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetOrientation(OF_ORIENTATION_90_LEFT);
 	synth.loadSound("sounds/synth.wav");
 	beats.loadSound("sounds/1085.mp3");
@@ -15,13 +15,13 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	// update the sound playing system:
 	ofSoundUpdate();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackground(255,255,255);
 	
 	char tempStr[255];
@@ -68,22 +68,22 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 	float widthStep = ofGetWidth() / 3.0f;
 	if (x < widthStep){
 		float pct = x / widthStep;
@@ -100,7 +100,7 @@ void testApp::touchDown(int x, int y, int id){
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 	// continuously control the speed of the beat sample via drag,
 	// when in the "beat" region:
 	float widthStep = ofGetWidth() / 3.0f;
@@ -110,56 +110,56 @@ void testApp::touchMoved(int x, int y, int id){
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidSoundPlayerExample/src/testApp.h b/examples/android/androidSoundPlayerExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidSoundPlayerExample/src/testApp.h
rename to examples/android/androidSoundPlayerExample/src/ofApp.h
index 0902cd1c8cb..c0180a2a39d 100644
--- a/examples/android/androidSoundPlayerExample/src/testApp.h
+++ b/examples/android/androidSoundPlayerExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxAndroid.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 
 	public:
 		void setup();
diff --git a/examples/android/androidSwipeExample/src/main.cpp b/examples/android/androidSwipeExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidSwipeExample/src/main.cpp
+++ b/examples/android/androidSwipeExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidSwipeExample/src/testApp.cpp b/examples/android/androidSwipeExample/src/ofApp.cpp
similarity index 61%
rename from examples/android/androidSwipeExample/src/testApp.cpp
rename to examples/android/androidSwipeExample/src/ofApp.cpp
index ca19e0fb4e4..41c757bd8d8 100644
--- a/examples/android/androidSwipeExample/src/testApp.cpp
+++ b/examples/android/androidSwipeExample/src/ofApp.cpp
@@ -1,79 +1,79 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofRegisterTouchEvents((ofxAndroidApp*)this);
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 	ofLogNotice() << "touch down " << x << "," << y << ":" << id;
 
 }
 
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 	ofLogNotice() << "touch moved " << x << "," << y << ":" << id;
 
 }
 
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 	ofLogNotice() << "touch up " << x << "," << y << ":" << id;
 
 }
 
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 	ofLogNotice() << "touch double " << x << "," << y << ":" << id;
 
 }
 
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 	ofLogNotice() << "touch cacelled " << x << "," << y << ":" << id;
 
 }
 
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 	ofLogNotice() << "swipes " << swipeDir << id;
 }
diff --git a/examples/android/androidSwipeExample/src/testApp.h b/examples/android/androidSwipeExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidSwipeExample/src/testApp.h
rename to examples/android/androidSwipeExample/src/ofApp.h
index ebebbf08077..0c934cc2ae8 100644
--- a/examples/android/androidSwipeExample/src/testApp.h
+++ b/examples/android/androidSwipeExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofMain.h"
 #include "ofxAndroid.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidTouchExample/src/main.cpp b/examples/android/androidTouchExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidTouchExample/src/main.cpp
+++ b/examples/android/androidTouchExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidTouchExample/src/testApp.cpp b/examples/android/androidTouchExample/src/ofApp.cpp
similarity index 71%
rename from examples/android/androidTouchExample/src/testApp.cpp
rename to examples/android/androidTouchExample/src/ofApp.cpp
index e712263cf11..0db697263a8 100644
--- a/examples/android/androidTouchExample/src/testApp.cpp
+++ b/examples/android/androidTouchExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	// initialize the accelerometer
 	ofxAccelerometer.setup();
 
@@ -10,95 +10,95 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	for(int i=0; i<NUM_POINTS; i++) balls[i].update();
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	for(int i=0; i<NUM_POINTS; i++) balls[i].draw();
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 	//toggle the touched state of the ball
 	balls[id].touched = true;
 	balls[id].moveTo(x, y);
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 	balls[id].moveTo(x, y);
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 	//toggles off the touched state of the ball
 	balls[id].touched = false;
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
 
diff --git a/examples/android/androidTouchExample/src/testApp.h b/examples/android/androidTouchExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidTouchExample/src/testApp.h
rename to examples/android/androidTouchExample/src/ofApp.h
index 29d39188ce2..51e1ea0d5c2 100644
--- a/examples/android/androidTouchExample/src/testApp.h
+++ b/examples/android/androidTouchExample/src/ofApp.h
@@ -8,7 +8,7 @@
 
 #define NUM_POINTS				10
 
-class testApp : public ofxAndroidApp {
+class ofApp : public ofxAndroidApp {
 	
 public:
 
diff --git a/examples/android/androidVBOExample/src/main.cpp b/examples/android/androidVBOExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidVBOExample/src/main.cpp
+++ b/examples/android/androidVBOExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidVBOExample/src/testApp.cpp b/examples/android/androidVBOExample/src/ofApp.cpp
similarity index 83%
rename from examples/android/androidVBOExample/src/testApp.cpp
rename to examples/android/androidVBOExample/src/ofApp.cpp
index a059037365f..b24020e2862 100644
--- a/examples/android/androidVBOExample/src/testApp.cpp
+++ b/examples/android/androidVBOExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(0,0,0);
 
 	bPause	   = false;
@@ -42,7 +42,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	if(!bPause) {
 		ofVec3f vec;
@@ -76,7 +76,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 
 	ofPushMatrix();
 	ofTranslate(ofGetWidth()/2, ofGetHeight()/2, zoom);
@@ -108,64 +108,64 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 	if(id == 2) bPause = !bPause;
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 	if(id == 1) {
 		zoomTarget = ofMap(x, 0.0, ofGetWidth(), 100, 500);
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 	// android destroys the gl context when it pauses apps
 	// most OF textures are automatically regenerated
 	// but you'll need to regenerate the vbo yourself
@@ -173,21 +173,21 @@ void testApp::resume(){
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidVBOExample/src/testApp.h b/examples/android/androidVBOExample/src/ofApp.h
similarity index 95%
rename from examples/android/androidVBOExample/src/testApp.h
rename to examples/android/androidVBOExample/src/ofApp.h
index d90afa7f519..5ef515a3439 100644
--- a/examples/android/androidVBOExample/src/testApp.h
+++ b/examples/android/androidVBOExample/src/ofApp.h
@@ -7,7 +7,7 @@
 #define GRID_HEIGHT 16
 #define LENGTH		2 * 8
 
-class testApp : public ofxAndroidApp {
+class ofApp : public ofxAndroidApp {
 	
 public:
 	void setup();
diff --git a/examples/android/androidVibratorExample/src/main.cpp b/examples/android/androidVibratorExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidVibratorExample/src/main.cpp
+++ b/examples/android/androidVibratorExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidVibratorExample/src/testApp.cpp b/examples/android/androidVibratorExample/src/ofApp.cpp
similarity index 75%
rename from examples/android/androidVibratorExample/src/testApp.cpp
rename to examples/android/androidVibratorExample/src/ofApp.cpp
index c48c6c136af..eceaf507ec9 100644
--- a/examples/android/androidVibratorExample/src/testApp.cpp
+++ b/examples/android/androidVibratorExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofxAndroidVibrator.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	float y=0;
 	float height=2;
 	ofLogError() << ofGetWidth() << "," << ofGetHeight();
@@ -16,12 +16,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetColor(255);
 	for(int i=0;i<areas.size();i++){
 		ofRect(areas[i]);
@@ -31,27 +31,27 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 	bool found=false;
 	for(int i=0;i<areas.size();i++){
 		if(areas[i].inside(ofVec2f(x,y))){
@@ -68,57 +68,57 @@ void testApp::touchMoved(int x, int y, int id){
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 	inside = false;
 	ofxAndroidVibrator::stop();
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidVibratorExample/src/testApp.h b/examples/android/androidVibratorExample/src/ofApp.h
similarity index 94%
rename from examples/android/androidVibratorExample/src/testApp.h
rename to examples/android/androidVibratorExample/src/ofApp.h
index 49c453c9ab8..62103a7d72d 100644
--- a/examples/android/androidVibratorExample/src/testApp.h
+++ b/examples/android/androidVibratorExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxAndroid.h"
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/android/androidVideoExample/src/main.cpp b/examples/android/androidVideoExample/src/main.cpp
index 82bca02cc30..bc252b88fd1 100644
--- a/examples/android/androidVideoExample/src/main.cpp
+++ b/examples/android/androidVideoExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
@@ -7,7 +7,7 @@ int main(){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp() );
+	ofRunApp( new ofApp() );
 	return 0;
 }
 
diff --git a/examples/android/androidVideoExample/src/testApp.cpp b/examples/android/androidVideoExample/src/ofApp.cpp
similarity index 66%
rename from examples/android/androidVideoExample/src/testApp.cpp
rename to examples/android/androidVideoExample/src/ofApp.cpp
index b5a29888e7e..73b6130b28b 100644
--- a/examples/android/androidVideoExample/src/testApp.cpp
+++ b/examples/android/androidVideoExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	player.loadMovie("hands.mp4");
 	player.play();
@@ -9,95 +9,95 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	player.update();
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	player.draw(0,0);
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(int x, int y, int id){
+void ofApp::touchDown(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(int x, int y, int id){
+void ofApp::touchMoved(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(int x, int y, int id){
+void ofApp::touchUp(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(int x, int y, int id){
+void ofApp::touchDoubleTap(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(int x, int y, int id){
+void ofApp::touchCancelled(int x, int y, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
+void ofApp::swipe(ofxAndroidSwipeDir swipeDir, int id){
 
 }
 
 //--------------------------------------------------------------
-void testApp::pause(){
+void ofApp::pause(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::stop(){
+void ofApp::stop(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::resume(){
+void ofApp::resume(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::reloadTextures(){
+void ofApp::reloadTextures(){
 
 }
 
 //--------------------------------------------------------------
-bool testApp::backPressed(){
+bool ofApp::backPressed(){
 	return false;
 }
 
 //--------------------------------------------------------------
-void testApp::okPressed(){
+void ofApp::okPressed(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::cancelPressed(){
+void ofApp::cancelPressed(){
 
 }
diff --git a/examples/android/androidVideoExample/src/testApp.h b/examples/android/androidVideoExample/src/ofApp.h
similarity index 95%
rename from examples/android/androidVideoExample/src/testApp.h
rename to examples/android/androidVideoExample/src/ofApp.h
index 1ad5c3d478e..3927bdb480a 100644
--- a/examples/android/androidVideoExample/src/testApp.h
+++ b/examples/android/androidVideoExample/src/ofApp.h
@@ -9,7 +9,7 @@
 // an openGL texture from the video frames are only
 // available from that version
 
-class testApp : public ofxAndroidApp{
+class ofApp : public ofxAndroidApp{
 	
 	public:
 		
diff --git a/examples/communication/firmataExample/src/main.cpp b/examples/communication/firmataExample/src/main.cpp
index 31444cedc8c..541d9f8a2b6 100644
--- a/examples/communication/firmataExample/src/main.cpp
+++ b/examples/communication/firmataExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/communication/firmataExample/src/testApp.cpp b/examples/communication/firmataExample/src/ofApp.cpp
similarity index 87%
rename from examples/communication/firmataExample/src/testApp.cpp
rename to examples/communication/firmataExample/src/ofApp.cpp
index f71c2108f40..18e1e432b44 100644
--- a/examples/communication/firmataExample/src/testApp.cpp
+++ b/examples/communication/firmataExample/src/ofApp.cpp
@@ -22,11 +22,11 @@
  *
  */
 
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	ofSetVerticalSync(true);
 	ofSetFrameRate(60);
@@ -48,22 +48,22 @@ void testApp::setup(){
 	// listen for EInitialized notification. this indicates that
 	// the arduino is ready to receive commands and it is safe to
 	// call setupArduino()
-	ofAddListener(ard.EInitialized, this, &testApp::setupArduino);
+	ofAddListener(ard.EInitialized, this, &ofApp::setupArduino);
 	bSetupArduino	= false;	// flag so we setup arduino when its ready, you don't need to touch this :)
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	updateArduino();
 
 }
 
 //--------------------------------------------------------------
-void testApp::setupArduino(const int & version) {
+void ofApp::setupArduino(const int & version) {
 	
 	// remove listener because we don't need it anymore
-	ofRemoveListener(ard.EInitialized, this, &testApp::setupArduino);
+	ofRemoveListener(ard.EInitialized, this, &ofApp::setupArduino);
     
     // it is now safe to send commands to the Arduino
     bSetupArduino = true;
@@ -97,12 +97,12 @@ void testApp::setupArduino(const int & version) {
     ard.sendServoAttach(9);
 	
     // Listen for changes on the digital and analog pins
-    ofAddListener(ard.EDigitalPinChanged, this, &testApp::digitalPinChanged);
-    ofAddListener(ard.EAnalogPinChanged, this, &testApp::analogPinChanged);    
+    ofAddListener(ard.EDigitalPinChanged, this, &ofApp::digitalPinChanged);
+    ofAddListener(ard.EAnalogPinChanged, this, &ofApp::analogPinChanged);    
 }
 
 //--------------------------------------------------------------
-void testApp::updateArduino(){
+void ofApp::updateArduino(){
 
 	// update the arduino, get any data or messages.
     // the call to ard.update() is required
@@ -121,7 +121,7 @@ void testApp::updateArduino(){
 // by the digitalPinChanged function rather than the analogPinChanged function.
 
 //--------------------------------------------------------------
-void testApp::digitalPinChanged(const int & pinNum) {
+void ofApp::digitalPinChanged(const int & pinNum) {
     // do something with the digital input. here we're simply going to print the pin number and
     // value to the screen each time it changes
     buttonState = "digital pin: " + ofToString(pinNum) + " = " + ofToString(ard.getDigital(pinNum));
@@ -130,7 +130,7 @@ void testApp::digitalPinChanged(const int & pinNum) {
 // analog pin event handler, called whenever an analog pin value has changed
 
 //--------------------------------------------------------------
-void testApp::analogPinChanged(const int & pinNum) {
+void ofApp::analogPinChanged(const int & pinNum) {
     // do something with the analog input. here we're simply going to print the pin number and
     // value to the screen each time it changes
     potValue = "analog pin: " + ofToString(pinNum) + " = " + ofToString(ard.getAnalog(pinNum));
@@ -138,7 +138,7 @@ void testApp::analogPinChanged(const int & pinNum) {
 
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	bgImage.draw(0,0);
     
     ofEnableAlphaBlending();
@@ -162,7 +162,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
     switch (key) {
         case OF_KEY_RIGHT:
             // rotate servo head to 180 degrees
@@ -180,43 +180,43 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     // turn on the onboard LED when the application window is clicked
 	ard.sendDigital(13, ARD_HIGH);
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     // turn off the onboard LED when the application window is clicked
 	ard.sendDigital(13, ARD_LOW);
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/communication/firmataExample/src/testApp.h b/examples/communication/firmataExample/src/ofApp.h
similarity index 96%
rename from examples/communication/firmataExample/src/testApp.h
rename to examples/communication/firmataExample/src/ofApp.h
index fcf1d000f6b..ee1c57a8c52 100644
--- a/examples/communication/firmataExample/src/testApp.h
+++ b/examples/communication/firmataExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofEvents.h"
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 public:
 
diff --git a/examples/communication/serialExample/src/main.cpp b/examples/communication/serialExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/communication/serialExample/src/main.cpp
+++ b/examples/communication/serialExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/communication/serialExample/src/testApp.cpp b/examples/communication/serialExample/src/ofApp.cpp
similarity index 85%
rename from examples/communication/serialExample/src/testApp.cpp
rename to examples/communication/serialExample/src/ofApp.cpp
index 1fe6ace6215..ceb6e83a859 100644
--- a/examples/communication/serialExample/src/testApp.cpp
+++ b/examples/communication/serialExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	
 	bSendSerialMessage = false;
@@ -29,7 +29,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	if (bSendSerialMessage){
 		
@@ -66,7 +66,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	if (nBytesRead > 0 && ((ofGetElapsedTimef() - readTime) < 0.5f)){
 		ofSetColor(0);
 	} else {
@@ -82,47 +82,47 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	bSendSerialMessage = true;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
 
diff --git a/examples/communication/serialExample/src/testApp.h b/examples/communication/serialExample/src/ofApp.h
similarity index 96%
rename from examples/communication/serialExample/src/testApp.h
rename to examples/communication/serialExample/src/ofApp.h
index 5102cae34b4..54435980d74 100644
--- a/examples/communication/serialExample/src/testApp.h
+++ b/examples/communication/serialExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		void setup();
diff --git a/examples/empty/emptyExample/src/main.cpp b/examples/empty/emptyExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/empty/emptyExample/src/main.cpp
+++ b/examples/empty/emptyExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/empty/emptyExample/src/testApp.cpp b/examples/empty/emptyExample/src/ofApp.cpp
similarity index 62%
rename from examples/empty/emptyExample/src/testApp.cpp
rename to examples/empty/emptyExample/src/ofApp.cpp
index 9cf995fed40..3e7b5174c94 100644
--- a/examples/empty/emptyExample/src/testApp.cpp
+++ b/examples/empty/emptyExample/src/ofApp.cpp
@@ -1,61 +1,61 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/empty/emptyExample/src/testApp.h b/examples/empty/emptyExample/src/ofApp.h
similarity index 92%
rename from examples/empty/emptyExample/src/testApp.h
rename to examples/empty/emptyExample/src/ofApp.h
index 532f2bcb74c..d800fe00d16 100644
--- a/examples/empty/emptyExample/src/testApp.h
+++ b/examples/empty/emptyExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/events/advancedEventsExample/src/main.cpp b/examples/events/advancedEventsExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/events/advancedEventsExample/src/main.cpp
+++ b/examples/events/advancedEventsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/events/advancedEventsExample/src/testApp.cpp b/examples/events/advancedEventsExample/src/ofApp.cpp
similarity index 65%
rename from examples/events/advancedEventsExample/src/testApp.cpp
rename to examples/events/advancedEventsExample/src/ofApp.cpp
index 4c40566fec5..c63e70d7206 100644
--- a/examples/events/advancedEventsExample/src/testApp.cpp
+++ b/examples/events/advancedEventsExample/src/ofApp.cpp
@@ -1,63 +1,63 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(50,50,50);
 
     enabled=false;
 
 	// add the newFloat method to listen for eventsAddon newFloatEvent
-	ofAddListener(evObject.newFloatEvent,this,&testApp::newFloat);
+	ofAddListener(evObject.newFloatEvent,this,&ofApp::newFloat);
 
 	// add the newFloat method to listen for eventsAddon newFloatEvent
-	ofAddListener(evObject.newIntEvent,this,&testApp::newInt);
+	ofAddListener(evObject.newIntEvent,this,&ofApp::newInt);
 }
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofDrawBitmapString(floatMsg,20,20);
 	ofDrawBitmapString(intMsg,20,40);
 	ofDrawBitmapString("click to enable/disable events",20,60);
 }
 
 //--------------------------------------------------------------
-void testApp::newFloat(float & f){
+void ofApp::newFloat(float & f){
 	floatMsg 	= "newFloat event:  " + ofToString(f);
 }
 
 //--------------------------------------------------------------
-void testApp::newInt(int & i){
+void ofApp::newInt(int & i){
 	intMsg	 	= "newInt   event:  " + ofToString(i);
 }
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     if(enabled)
         evObject.disable();
     else
@@ -68,22 +68,22 @@ void testApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
 
diff --git a/examples/events/advancedEventsExample/src/testApp.h b/examples/events/advancedEventsExample/src/ofApp.h
similarity index 95%
rename from examples/events/advancedEventsExample/src/testApp.h
rename to examples/events/advancedEventsExample/src/ofApp.h
index 19f3d489b93..7be655a1826 100644
--- a/examples/events/advancedEventsExample/src/testApp.h
+++ b/examples/events/advancedEventsExample/src/ofApp.h
@@ -9,7 +9,7 @@
 
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/events/customEventExample/src/main.cpp b/examples/events/customEventExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/events/customEventExample/src/main.cpp
+++ b/examples/events/customEventExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/events/customEventExample/src/testApp.cpp b/examples/events/customEventExample/src/ofApp.cpp
similarity index 90%
rename from examples/events/customEventExample/src/testApp.cpp
rename to examples/events/customEventExample/src/ofApp.cpp
index 004e6f59b8f..59a42b92732 100644
--- a/examples/events/customEventExample/src/testApp.cpp
+++ b/examples/events/customEventExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 /*
@@ -19,7 +19,7 @@
  */
 
 //--------------------------------------------------------------
-bool testApp::shouldRemoveBullet(Bullet &b) {
+bool ofApp::shouldRemoveBullet(Bullet &b) {
     
     if(b.bRemove) return true;
     
@@ -40,12 +40,12 @@ bool testApp::shouldRemoveBullet(Bullet &b) {
 }
 
 //--------------------------------------------------------------
-bool testApp::shouldRemoveBug(Bug &b) {
+bool ofApp::shouldRemoveBug(Bug &b) {
     return b.bRemove;
 }
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
     
     ofBackgroundHex(0xc5c9b2);
     ofSetFrameRate(60);
@@ -62,12 +62,12 @@ void testApp::setup() {
     }
     
     // listen to any of the events for the game
-    ofAddListener(GameEvent::events, this, &testApp::gameEvent);
+    ofAddListener(GameEvent::events, this, &ofApp::gameEvent);
     
 }
 
 //--------------------------------------------------------------
-void testApp::gameEvent(GameEvent &e) {
+void ofApp::gameEvent(GameEvent &e) {
     
     cout << "Game Event: "+e.message << endl;
     e.bug->timeBugKilled = ofGetElapsedTimef();
@@ -79,7 +79,7 @@ void testApp::gameEvent(GameEvent &e) {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
     
     if((int)ofRandom(0, 20)==10) {
         
@@ -145,7 +145,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     
     // draw the bug holes
     for(unsigned int i=0; i<holes.size(); i++) {
@@ -210,7 +210,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key) {
+void ofApp::keyPressed(int key) {
     if(key == ' ') {
         if(bullets.size() < maxBullets) {
             bFire = true;
@@ -242,41 +242,41 @@ void testApp::keyPressed(int key) {
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key) {
+void ofApp::keyReleased(int key) {
     bFire = false;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/events/customEventExample/src/testApp.h b/examples/events/customEventExample/src/ofApp.h
similarity index 95%
rename from examples/events/customEventExample/src/testApp.h
rename to examples/events/customEventExample/src/ofApp.h
index 7ac1ccf875c..21368b6995b 100644
--- a/examples/events/customEventExample/src/testApp.h
+++ b/examples/events/customEventExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "Bullet.h"
 #include "GameEvent.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 			
 	public:
 
diff --git a/examples/events/eventsExample/src/main.cpp b/examples/events/eventsExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/events/eventsExample/src/main.cpp
+++ b/examples/events/eventsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/events/eventsExample/src/testApp.cpp b/examples/events/eventsExample/src/ofApp.cpp
similarity index 89%
rename from examples/events/eventsExample/src/testApp.cpp
rename to examples/events/eventsExample/src/ofApp.cpp
index 3031b774a8c..754968b496a 100644
--- a/examples/events/eventsExample/src/testApp.cpp
+++ b/examples/events/eventsExample/src/ofApp.cpp
@@ -1,19 +1,19 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	 
+void ofApp::setup(){	 
 	counter = 0;
 	vagRounded.loadFont("vag.ttf", 32);
 	ofBackground(50,50,50);	
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	counter = counter + 0.033f;
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	sprintf (timeString, "time: %i:%i:%i \nelapsed time %lli", ofGetHours(), ofGetMinutes(), ofGetSeconds(), ofGetElapsedTimeMillis());
 	
@@ -37,7 +37,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	if(key & OF_KEY_MODIFIER){
 		if(key >= OF_KEY_F1 && key <= OF_KEY_F12){
 			sprintf(eventString, "keyPressed = (%i) %s", key, ("F" + ofToString(key+1-OF_KEY_F1)).c_str());
@@ -99,7 +99,7 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	if(key & OF_KEY_MODIFIER){
 		if(key >= OF_KEY_F1 && key <= OF_KEY_F12){
 			sprintf(eventString, "keyReleased = (%i) %s", key, ("F" + ofToString(key+1-OF_KEY_F1)).c_str());
@@ -161,36 +161,36 @@ void testApp::keyReleased(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	sprintf(eventString, "mouseMoved = (%i,%i)", x, y);
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	sprintf(eventString, "mouseDragged = (%i,%i - button %i)", x, y, button);
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	sprintf(eventString, "mousePressed = (%i,%i - button %i)", x, y, button);
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	sprintf(eventString, "mouseReleased = (%i,%i - button %i)", x, y, button);
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	sprintf(eventString, "resized = (%i,%i)", w, h);
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	sprintf(eventString, "gotMessage %s ", msg.message.c_str());
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	sprintf(eventString, "%i files dragged into the window at (%i, %i)", (int)dragInfo.files.size(), (int)dragInfo.position.x, (int)dragInfo.position.y);
 }
diff --git a/examples/events/eventsExample/src/testApp.h b/examples/events/eventsExample/src/ofApp.h
similarity index 94%
rename from examples/events/eventsExample/src/testApp.h
rename to examples/events/eventsExample/src/ofApp.h
index 567525f62f3..d287ea94f4a 100644
--- a/examples/events/eventsExample/src/testApp.h
+++ b/examples/events/eventsExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/events/simpleEventsExample/src/main.cpp b/examples/events/simpleEventsExample/src/main.cpp
index ab54c233b76..8da2b168e4e 100644
--- a/examples/events/simpleEventsExample/src/main.cpp
+++ b/examples/events/simpleEventsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -8,6 +8,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/events/simpleEventsExample/src/testApp.cpp b/examples/events/simpleEventsExample/src/ofApp.cpp
similarity index 73%
rename from examples/events/simpleEventsExample/src/testApp.cpp
rename to examples/events/simpleEventsExample/src/ofApp.cpp
index 8bf34cc12f6..c859f919765 100644
--- a/examples/events/simpleEventsExample/src/testApp.cpp
+++ b/examples/events/simpleEventsExample/src/ofApp.cpp
@@ -1,6 +1,6 @@
-#include "testApp.h"
+#include "ofApp.h"
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofSetCircleResolution(64);
     //---------- init gray circles----------
     
@@ -17,15 +17,15 @@ void testApp::setup(){
     
     ofAddListener(redCircle.clickedInside, //the ofEvent that we want to listen to. In this case exclusively to the circleEvent of redCircle (red circle) object.
                   this, //pointer to the class that is going to be listening. it can be a pointer to any object. There's no need to declare the listeners within the class that's going to listen.
-                  &testApp::onMouseInCircle);//pointer to the method that's going to be called when a new event is broadcasted (callback method). The parameters of the event are passed to this method.
-    ofAddListener(Circle::clickedInsideGlobal , this, &testApp::onMouseInAnyCircle);//listening to this event will enable us to get events from any instance of the circle class as this event is static (shared by all instances of the same class).
+                  &ofApp::onMouseInCircle);//pointer to the method that's going to be called when a new event is broadcasted (callback method). The parameters of the event are passed to this method.
+    ofAddListener(Circle::clickedInsideGlobal , this, &ofApp::onMouseInAnyCircle);//listening to this event will enable us to get events from any instance of the circle class as this event is static (shared by all instances of the same class).
     
     //Notice that when calling the static event we are using :: while when calling the instance event we use a . (dot).
   }
 //--------------------------------------------------------------
-void testApp::update(){}
+void ofApp::update(){}
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackground(bg);
     redCircle.draw();
     
@@ -44,10 +44,10 @@ void testApp::draw(){
     ofDrawBitmapStringHighlight(msg, 30,30);    
 }
 //--------------------------------------------------------------
-void testApp::onMouseInCircle(ofVec2f & e){
+void ofApp::onMouseInCircle(ofVec2f & e){
     clickedPoint.set(e); 
 }
 //--------------------------------------------------------------
-void testApp::onMouseInAnyCircle(ofVec2f & e){
+void ofApp::onMouseInAnyCircle(ofVec2f & e){
      bg.set(ofRandom(255), ofRandom(255), ofRandom(255));
 }
diff --git a/examples/events/simpleEventsExample/src/testApp.h b/examples/events/simpleEventsExample/src/ofApp.h
similarity index 91%
rename from examples/events/simpleEventsExample/src/testApp.h
rename to examples/events/simpleEventsExample/src/ofApp.h
index 7966c0338c2..0e96be0ba31 100644
--- a/examples/events/simpleEventsExample/src/testApp.h
+++ b/examples/events/simpleEventsExample/src/ofApp.h
@@ -6,7 +6,7 @@
 
 #define TOTAL_GRAY_CIRCLES 10
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/events/simpleTimer/src/main.cpp b/examples/events/simpleTimer/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/events/simpleTimer/src/main.cpp
+++ b/examples/events/simpleTimer/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/events/simpleTimer/src/testApp.cpp b/examples/events/simpleTimer/src/ofApp.cpp
similarity index 85%
rename from examples/events/simpleTimer/src/testApp.cpp
rename to examples/events/simpleTimer/src/ofApp.cpp
index 0bcb5bf1ad6..4e7689c2db1 100644
--- a/examples/events/simpleTimer/src/testApp.cpp
+++ b/examples/events/simpleTimer/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
     ofBackgroundHex(0xc5c9b2);
     
     bTimerReached = false;
@@ -10,11 +10,11 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
     
 }
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
     float barWidth = 500;
 		
@@ -58,7 +58,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key) {
+void ofApp::keyPressed(int key) {
     if(key == ' ') {
         bTimerReached = false;                     // reset the timer
         startTime = ofGetElapsedTimeMillis();  // get the start time
@@ -68,42 +68,42 @@ void testApp::keyPressed(int key) {
 
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button) {
+void ofApp::mousePressed(int x, int y, int button) {
     startTime = ofGetElapsedTimeMillis();
     endTime = (int)ofRandom(100, 5000); // milliseconds
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
     cout << "Got the message: " + msg.message << endl;
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/events/simpleTimer/src/testApp.h b/examples/events/simpleTimer/src/ofApp.h
similarity index 94%
rename from examples/events/simpleTimer/src/testApp.h
rename to examples/events/simpleTimer/src/ofApp.h
index e8c5c4f34bc..777af11af5a 100644
--- a/examples/events/simpleTimer/src/testApp.h
+++ b/examples/events/simpleTimer/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 		
 	public:
 		void setup();
diff --git a/examples/gl/alphaMaskingShaderExample/src/main.cpp b/examples/gl/alphaMaskingShaderExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/alphaMaskingShaderExample/src/main.cpp
+++ b/examples/gl/alphaMaskingShaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/alphaMaskingShaderExample/src/testApp.cpp b/examples/gl/alphaMaskingShaderExample/src/ofApp.cpp
similarity index 89%
rename from examples/gl/alphaMaskingShaderExample/src/testApp.cpp
rename to examples/gl/alphaMaskingShaderExample/src/ofApp.cpp
index c84e5868096..86f1e46b975 100644
--- a/examples/gl/alphaMaskingShaderExample/src/testApp.cpp
+++ b/examples/gl/alphaMaskingShaderExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofEnableAlphaBlending();
     
     srcImg.loadImage("A.jpg");
@@ -100,7 +100,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     
     // MASK (frame buffer object)
     //
@@ -127,7 +127,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofSetColor(255,255);
     
     dstImg.draw(0,0);
@@ -139,48 +139,48 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     maskFbo.begin();
     ofClear(0,0,0,255);
     maskFbo.end();
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     bBrushDown = true;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     bBrushDown = false;
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gl/alphaMaskingShaderExample/src/testApp.h b/examples/gl/alphaMaskingShaderExample/src/ofApp.h
similarity index 95%
rename from examples/gl/alphaMaskingShaderExample/src/testApp.h
rename to examples/gl/alphaMaskingShaderExample/src/ofApp.h
index 440db7e7f80..ec40103307a 100644
--- a/examples/gl/alphaMaskingShaderExample/src/testApp.h
+++ b/examples/gl/alphaMaskingShaderExample/src/ofApp.h
@@ -4,7 +4,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 public:
     
     void setup();
diff --git a/examples/gl/billboardExample/src/main.cpp b/examples/gl/billboardExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/billboardExample/src/main.cpp
+++ b/examples/gl/billboardExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/billboardExample/src/testApp.cpp b/examples/gl/billboardExample/src/ofApp.cpp
similarity index 88%
rename from examples/gl/billboardExample/src/testApp.cpp
rename to examples/gl/billboardExample/src/ofApp.cpp
index cf3609647f1..1f46b14450e 100644
--- a/examples/gl/billboardExample/src/testApp.cpp
+++ b/examples/gl/billboardExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	ofBackground(0, 0, 0);
 	
 	cameraRotation.set(0);
@@ -47,7 +47,7 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	
 	float t = (ofGetElapsedTimef()) * 0.9f;
 	float div = 250.0;
@@ -77,7 +77,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofBackgroundGradient(ofColor(255), ofColor(230, 240, 255));
 	
 	string info = ofToString(ofGetFrameRate(), 2)+"\n";
@@ -108,7 +108,7 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 	if(key == 'f') ofToggleFullscreen();
 	if(key == OF_KEY_UP) zoomTarget +=10;
@@ -117,41 +117,41 @@ void testApp::keyPressed(int key){
 
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gl/billboardExample/src/testApp.h b/examples/gl/billboardExample/src/ofApp.h
similarity index 95%
rename from examples/gl/billboardExample/src/testApp.h
rename to examples/gl/billboardExample/src/ofApp.h
index ca6142b7db5..e5a1bef9d90 100644
--- a/examples/gl/billboardExample/src/testApp.h
+++ b/examples/gl/billboardExample/src/ofApp.h
@@ -4,7 +4,7 @@
 
 #define NUM_BILLBOARDS 5000
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/gl/billboardRotationExample/src/main.cpp b/examples/gl/billboardRotationExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/billboardRotationExample/src/main.cpp
+++ b/examples/gl/billboardRotationExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/billboardRotationExample/src/testApp.cpp b/examples/gl/billboardRotationExample/src/ofApp.cpp
similarity index 87%
rename from examples/gl/billboardRotationExample/src/testApp.cpp
rename to examples/gl/billboardRotationExample/src/ofApp.cpp
index 3bed888bc08..1830d02a456 100644
--- a/examples/gl/billboardRotationExample/src/testApp.cpp
+++ b/examples/gl/billboardRotationExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	ofBackground(0);
 	ofSetVerticalSync(true);
 	
@@ -41,7 +41,7 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	ofVec2f mouse(ofGetMouseX(), ofGetMouseY());
 	ofVec2f mouseVec(ofGetPreviousMouseX()-ofGetMouseX(), ofGetPreviousMouseY()-ofGetMouseY());
 	mouseVec.limit(10.0);
@@ -75,7 +75,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofEnableAlphaBlending();
 	ofSetColor(255);
 	
@@ -102,38 +102,38 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if(key == 'f') {
 		ofToggleFullscreen();
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button) {
+void ofApp::mouseDragged(int x, int y, int button) {
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button) {
+void ofApp::mousePressed(int x, int y, int button) {
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button) {
+void ofApp::mouseReleased(int x, int y, int button) {
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	for (int i=0; i<NUM_BILLBOARDS; i++) {
 		home[i].x = ofRandomWidth();
 		home[i].y = ofRandomHeight();
@@ -141,11 +141,11 @@ void testApp::windowResized(int w, int h){
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gl/billboardRotationExample/src/testApp.h b/examples/gl/billboardRotationExample/src/ofApp.h
similarity index 95%
rename from examples/gl/billboardRotationExample/src/testApp.h
rename to examples/gl/billboardRotationExample/src/ofApp.h
index 8f98ae06863..51ebd068e08 100644
--- a/examples/gl/billboardRotationExample/src/testApp.h
+++ b/examples/gl/billboardRotationExample/src/ofApp.h
@@ -4,7 +4,7 @@
 
 #define NUM_BILLBOARDS 10000
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/gl/fboTrailsExample/src/main.cpp b/examples/gl/fboTrailsExample/src/main.cpp
index 30b2e133bc1..315388049fe 100644
--- a/examples/gl/fboTrailsExample/src/main.cpp
+++ b/examples/gl/fboTrailsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/fboTrailsExample/src/testApp.cpp b/examples/gl/fboTrailsExample/src/ofApp.cpp
similarity index 87%
rename from examples/gl/fboTrailsExample/src/testApp.cpp
rename to examples/gl/fboTrailsExample/src/ofApp.cpp
index 032dd5a183c..8c34c0c3ad6 100644
--- a/examples/gl/fboTrailsExample/src/testApp.cpp
+++ b/examples/gl/fboTrailsExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
     ofBackground(0,0,0);
 	ofSetFrameRate(60);   
@@ -12,7 +12,7 @@ void testApp::setup(){
 
 	#ifdef TARGET_OPENGLES
 	rgbaFboFloat.allocate(400, 400, GL_RGBA ); // with alpha, 32 bits red, 32 bits green, 32 bits blue, 32 bits alpha, from 0 to 1 in 'infinite' steps
-        ofLogWarning("testApp") << "GL_RGBA32F_ARB is not available for OPENGLES.  Using RGBA.";	
+        ofLogWarning("ofApp") << "GL_RGBA32F_ARB is not available for OPENGLES.  Using RGBA.";	
 	#else
         rgbaFboFloat.allocate(400, 400, GL_RGBA32F_ARB); // with alpha, 32 bits red, 32 bits green, 32 bits blue, 32 bits alpha, from 0 to 1 in 'infinite' steps
 	#endif
@@ -45,7 +45,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
     ofEnableAlphaBlending();
 	
@@ -61,7 +61,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::drawFboTest(){
+void ofApp::drawFboTest(){
 	//we clear the fbo if c is pressed. 
 	//this completely clears the buffer so you won't see any trails
 	if( ofGetKeyPressed('c') ){
@@ -112,7 +112,7 @@ void testApp::drawFboTest(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
     ofSetColor(255,255,255);  	
     rgbaFbo.draw(0,0);
@@ -132,46 +132,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/gl/fboTrailsExample/src/testApp.h b/examples/gl/fboTrailsExample/src/ofApp.h
similarity index 95%
rename from examples/gl/fboTrailsExample/src/testApp.h
rename to examples/gl/fboTrailsExample/src/ofApp.h
index 1f08b515581..59025553df7 100644
--- a/examples/gl/fboTrailsExample/src/testApp.h
+++ b/examples/gl/fboTrailsExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/gl/geometryShaderExample/src/main.cpp b/examples/gl/geometryShaderExample/src/main.cpp
index 56c5bc97ec5..e8a173f1eb4 100644
--- a/examples/gl/geometryShaderExample/src/main.cpp
+++ b/examples/gl/geometryShaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -12,6 +12,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/geometryShaderExample/src/testApp.cpp b/examples/gl/geometryShaderExample/src/ofApp.cpp
similarity index 81%
rename from examples/gl/geometryShaderExample/src/testApp.cpp
rename to examples/gl/geometryShaderExample/src/ofApp.cpp
index 6471e3acd52..39e63cb1365 100644
--- a/examples/gl/geometryShaderExample/src/testApp.cpp
+++ b/examples/gl/geometryShaderExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	ofSetLogLevel(OF_LOG_VERBOSE);
 	ofBackground(50, 50, 50);
@@ -26,12 +26,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofPushMatrix();
 
 	if(doShader) {
@@ -62,49 +62,49 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	if( key == 's' ){
 		doShader = !doShader;
 	}	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
 
diff --git a/examples/gl/geometryShaderExample/src/testApp.h b/examples/gl/geometryShaderExample/src/ofApp.h
similarity index 93%
rename from examples/gl/geometryShaderExample/src/testApp.h
rename to examples/gl/geometryShaderExample/src/ofApp.h
index 1a05b609366..3e3009dc5d2 100644
--- a/examples/gl/geometryShaderExample/src/testApp.h
+++ b/examples/gl/geometryShaderExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		void setup();
diff --git a/examples/gl/glInfoExample/src/main.cpp b/examples/gl/glInfoExample/src/main.cpp
index 0ab71a02175..85612ad55f7 100644
--- a/examples/gl/glInfoExample/src/main.cpp
+++ b/examples/gl/glInfoExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/glInfoExample/src/testApp.cpp b/examples/gl/glInfoExample/src/ofApp.cpp
similarity index 95%
rename from examples/gl/glInfoExample/src/testApp.cpp
rename to examples/gl/glInfoExample/src/ofApp.cpp
index 3eaa70ec750..7de3fb9ab5b 100644
--- a/examples/gl/glInfoExample/src/testApp.cpp
+++ b/examples/gl/glInfoExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 #include "glewOutput.h"
 
 #include <stdio.h>
@@ -179,7 +179,7 @@ void printGLInfo(){
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 
     info.version = (char*)glGetString(GL_VERSION);
@@ -209,12 +209,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
     string output = "";
 
@@ -243,7 +243,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
     if (key == ' '){
 
@@ -315,41 +315,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/gl/glInfoExample/src/testApp.h b/examples/gl/glInfoExample/src/ofApp.h
similarity index 95%
rename from examples/gl/glInfoExample/src/testApp.h
rename to examples/gl/glInfoExample/src/ofApp.h
index e12abb9fd50..8d028d3a24b 100644
--- a/examples/gl/glInfoExample/src/testApp.h
+++ b/examples/gl/glInfoExample/src/ofApp.h
@@ -22,7 +22,7 @@ typedef struct {
 } commonOpenGlInfo;
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/gl/gpuParticleSystemExample/src/main.cpp b/examples/gl/gpuParticleSystemExample/src/main.cpp
index 2a477b0e7c4..f97356869cc 100644
--- a/examples/gl/gpuParticleSystemExample/src/main.cpp
+++ b/examples/gl/gpuParticleSystemExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -13,6 +13,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/gpuParticleSystemExample/src/testApp.cpp b/examples/gl/gpuParticleSystemExample/src/ofApp.cpp
similarity index 93%
rename from examples/gl/gpuParticleSystemExample/src/testApp.cpp
rename to examples/gl/gpuParticleSystemExample/src/ofApp.cpp
index aee2bfef015..4cc958618c7 100644
--- a/examples/gl/gpuParticleSystemExample/src/testApp.cpp
+++ b/examples/gl/gpuParticleSystemExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     particleSize = 30.0f;
     timeStep = 0.005f;
     numParticles = 1000;
@@ -85,7 +85,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     // In each cycle it�s going to update the velocity first and the the position
     // Each one one with a different shader and FBO.
     // Because on GPU you can�t write over the texture that you are reading we are
@@ -173,7 +173,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackground(0);
     
     ofSetColor(100,255,255);
@@ -184,46 +184,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gl/gpuParticleSystemExample/src/testApp.h b/examples/gl/gpuParticleSystemExample/src/ofApp.h
similarity index 98%
rename from examples/gl/gpuParticleSystemExample/src/testApp.h
rename to examples/gl/gpuParticleSystemExample/src/ofApp.h
index 7d2d5d498d9..c6baa71b7ac 100644
--- a/examples/gl/gpuParticleSystemExample/src/testApp.h
+++ b/examples/gl/gpuParticleSystemExample/src/ofApp.h
@@ -64,7 +64,7 @@ struct pingPongBuffer {
 };
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 public:
     void setup();
     void update();
diff --git a/examples/gl/multiLightExample/src/main.cpp b/examples/gl/multiLightExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/multiLightExample/src/main.cpp
+++ b/examples/gl/multiLightExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/multiLightExample/src/testApp.cpp b/examples/gl/multiLightExample/src/ofApp.cpp
similarity index 93%
rename from examples/gl/multiLightExample/src/testApp.cpp
rename to examples/gl/multiLightExample/src/ofApp.cpp
index a49cd042c72..331fe3cdae9 100644
--- a/examples/gl/multiLightExample/src/testApp.cpp
+++ b/examples/gl/multiLightExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofSetVerticalSync(true);
 	ofSetFrameRate(60);
 	ofBackground(10, 10, 10);
@@ -71,7 +71,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
     pointLight.setPosition(cos(ofGetElapsedTimef()*.6f) * radius * 2 + center.x, 
 						   sin(ofGetElapsedTimef()*.8f) * radius * 2 + center.y, 
 						   -cos(ofGetElapsedTimef()*.8f) * radius * 2 + center.z);
@@ -81,7 +81,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     // enable lighting //
     ofEnableLighting();
     // enable the material, so that it applies to all 3D objects before material.end() call //
@@ -145,7 +145,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     switch (key) {
 		case '1':
 			bPointLight = !bPointLight;
@@ -190,41 +190,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/gl/multiLightExample/src/testApp.h b/examples/gl/multiLightExample/src/ofApp.h
similarity index 95%
rename from examples/gl/multiLightExample/src/testApp.h
rename to examples/gl/multiLightExample/src/ofApp.h
index 271e7c5070e..37f1ef8ad96 100644
--- a/examples/gl/multiLightExample/src/testApp.h
+++ b/examples/gl/multiLightExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 public:
     void setup();
diff --git a/examples/gl/multiTextureShaderExample/src/main.cpp b/examples/gl/multiTextureShaderExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/multiTextureShaderExample/src/main.cpp
+++ b/examples/gl/multiTextureShaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/multiTextureShaderExample/src/testApp.cpp b/examples/gl/multiTextureShaderExample/src/ofApp.cpp
similarity index 91%
rename from examples/gl/multiTextureShaderExample/src/testApp.cpp
rename to examples/gl/multiTextureShaderExample/src/ofApp.cpp
index 1499e66c191..a7dd4b6f180 100644
--- a/examples/gl/multiTextureShaderExample/src/testApp.cpp
+++ b/examples/gl/multiTextureShaderExample/src/ofApp.cpp
@@ -1,9 +1,9 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 #define STRINGIFY(A) #A
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofEnableAlphaBlending();
     int camWidth 		= 320;	// try to grab at this size. 
 	int camHeight 		= 240;
@@ -70,7 +70,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     vidGrabber.update();
     fingerMovie.update();
         
@@ -108,7 +108,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackground(ofColor::gray);
     
     // draw everything
@@ -138,46 +138,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gl/multiTextureShaderExample/src/testApp.h b/examples/gl/multiTextureShaderExample/src/ofApp.h
similarity index 95%
rename from examples/gl/multiTextureShaderExample/src/testApp.h
rename to examples/gl/multiTextureShaderExample/src/ofApp.h
index bb120cf51a8..df9730d655d 100644
--- a/examples/gl/multiTextureShaderExample/src/testApp.h
+++ b/examples/gl/multiTextureShaderExample/src/ofApp.h
@@ -4,7 +4,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 public:
     
     void setup();
diff --git a/examples/gl/pointsAsTextures/src/main.cpp b/examples/gl/pointsAsTextures/src/main.cpp
index 6514bf8a134..6bd94426b9c 100644
--- a/examples/gl/pointsAsTextures/src/main.cpp
+++ b/examples/gl/pointsAsTextures/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 #ifdef TARGET_OPENGLES
 #include "ofGLProgrammableRenderer.h"
 #endif
@@ -16,6 +16,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/pointsAsTextures/src/testApp.cpp b/examples/gl/pointsAsTextures/src/ofApp.cpp
similarity index 87%
rename from examples/gl/pointsAsTextures/src/testApp.cpp
rename to examples/gl/pointsAsTextures/src/ofApp.cpp
index a6073541b72..6e87d9a8f79 100644
--- a/examples/gl/pointsAsTextures/src/testApp.cpp
+++ b/examples/gl/pointsAsTextures/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	
 	ofBackgroundHex(0x000000);
 	ofSetFrameRate(60);
@@ -49,11 +49,11 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 
 	glDepthMask(GL_FALSE);
 	
@@ -109,7 +109,7 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::addPoint(float x, float y, float z) {
+void ofApp::addPoint(float x, float y, float z) {
 	ofVec3f p(x, y, z);
 	points.push_back(p);
 	
@@ -119,7 +119,7 @@ void testApp::addPoint(float x, float y, float z) {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key) {
+void ofApp::keyPressed(int key) {
 	
 	if(key == OF_KEY_UP) {
 		camDist -= 10;
@@ -154,41 +154,41 @@ void testApp::keyPressed(int key) {
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gl/pointsAsTextures/src/testApp.h b/examples/gl/pointsAsTextures/src/ofApp.h
similarity index 95%
rename from examples/gl/pointsAsTextures/src/testApp.h
rename to examples/gl/pointsAsTextures/src/ofApp.h
index d60633ca815..3e1d65875b4 100644
--- a/examples/gl/pointsAsTextures/src/testApp.h
+++ b/examples/gl/pointsAsTextures/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/gl/shaderExample/src/main.cpp b/examples/gl/shaderExample/src/main.cpp
index 31584814084..c09200580b2 100644
--- a/examples/gl/shaderExample/src/main.cpp
+++ b/examples/gl/shaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 #ifdef TARGET_OPENGLES
 #include "ofGLProgrammableRenderer.h"
 #endif
@@ -15,6 +15,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/shaderExample/src/testApp.cpp b/examples/gl/shaderExample/src/ofApp.cpp
similarity index 81%
rename from examples/gl/shaderExample/src/testApp.cpp
rename to examples/gl/shaderExample/src/ofApp.cpp
index db29614f868..1c7b7531143 100644
--- a/examples/gl/shaderExample/src/testApp.cpp
+++ b/examples/gl/shaderExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(34, 34, 34);
 	ofSetVerticalSync(false);
 	ofEnableAlphaBlending();
@@ -22,12 +22,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetColor(225);
 	ofDrawBitmapString("'s' toggles shader", 10, 20);
@@ -56,49 +56,49 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	if( key == 's' ){
 		doShader = !doShader;
 	}	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
 
diff --git a/examples/gl/shaderExample/src/testApp.h b/examples/gl/shaderExample/src/ofApp.h
similarity index 93%
rename from examples/gl/shaderExample/src/testApp.h
rename to examples/gl/shaderExample/src/ofApp.h
index 9a130329905..70b4174f31b 100644
--- a/examples/gl/shaderExample/src/testApp.h
+++ b/examples/gl/shaderExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		void setup();
diff --git a/examples/gl/singleLightExample/src/main.cpp b/examples/gl/singleLightExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/singleLightExample/src/main.cpp
+++ b/examples/gl/singleLightExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/singleLightExample/src/testApp.cpp b/examples/gl/singleLightExample/src/ofApp.cpp
similarity index 87%
rename from examples/gl/singleLightExample/src/testApp.cpp
rename to examples/gl/singleLightExample/src/ofApp.cpp
index 423ea6ea86e..e7dd6a14c26 100644
--- a/examples/gl/singleLightExample/src/testApp.cpp
+++ b/examples/gl/singleLightExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofSetVerticalSync(true);
 	ofSetFrameRate(60);
 	ofBackground(10, 10, 10);
@@ -44,7 +44,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	colorHue += .1f;
     if(colorHue >= 255) colorHue = 0.f;
     lightColor.setHue(colorHue);
@@ -63,7 +63,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
     
     ofSetColor(pointLight.getDiffuseColor());
     ofDrawSphere(pointLight.getPosition(), 20.f);
@@ -98,7 +98,7 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     switch (key) {
         case 'w':
             bDrawWireframe = !bDrawWireframe;
@@ -109,41 +109,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
     pointLight.setPosition(x, y, 0);
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/gl/singleLightExample/src/testApp.h b/examples/gl/singleLightExample/src/ofApp.h
similarity index 95%
rename from examples/gl/singleLightExample/src/testApp.h
rename to examples/gl/singleLightExample/src/ofApp.h
index dbfdb10c758..e42eca6697a 100644
--- a/examples/gl/singleLightExample/src/testApp.h
+++ b/examples/gl/singleLightExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 public:
     void setup();
diff --git a/examples/gl/slowFastRendering/src/main.cpp b/examples/gl/slowFastRendering/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/slowFastRendering/src/main.cpp
+++ b/examples/gl/slowFastRendering/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/slowFastRendering/src/testApp.cpp b/examples/gl/slowFastRendering/src/ofApp.cpp
similarity index 88%
rename from examples/gl/slowFastRendering/src/testApp.cpp
rename to examples/gl/slowFastRendering/src/ofApp.cpp
index 726979e42a7..5b92aaffdea 100644
--- a/examples/gl/slowFastRendering/src/testApp.cpp
+++ b/examples/gl/slowFastRendering/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
     
     ofBackgroundHex(0x57554c);
     ofSetFrameRate(60);
@@ -16,7 +16,7 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
     
     
     // add points all the time
@@ -50,7 +50,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
     
     // draw the points the slow way
     if(mode == 1) {
@@ -96,7 +96,7 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key) {
+void ofApp::keyPressed(int key) {
     
     if(key == '1') mode = 1;
     if(key == '2') mode = 2;
@@ -119,17 +119,17 @@ void testApp::keyPressed(int key) {
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
     
     // add a bunch as you drag
     for (int i=0; i<400; i++) {
@@ -138,26 +138,26 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
     
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
     
 }
diff --git a/examples/gl/slowFastRendering/src/testApp.h b/examples/gl/slowFastRendering/src/ofApp.h
similarity index 96%
rename from examples/gl/slowFastRendering/src/testApp.h
rename to examples/gl/slowFastRendering/src/ofApp.h
index 3a7ba1749f8..86e8191206d 100644
--- a/examples/gl/slowFastRendering/src/testApp.h
+++ b/examples/gl/slowFastRendering/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
     
 public:
     void setup();
diff --git a/examples/gl/textureExample/src/main.cpp b/examples/gl/textureExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/textureExample/src/main.cpp
+++ b/examples/gl/textureExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/textureExample/src/testApp.cpp b/examples/gl/textureExample/src/ofApp.cpp
similarity index 84%
rename from examples/gl/textureExample/src/testApp.cpp
rename to examples/gl/textureExample/src/ofApp.cpp
index 364ffb3f3aa..729004888a2 100644
--- a/examples/gl/textureExample/src/testApp.cpp
+++ b/examples/gl/textureExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 
 
 	w = 250;
@@ -51,7 +51,7 @@ void testApp::setup(){
  
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	ofBackground(255,255,255);
 	
@@ -65,7 +65,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetHexColor(0xffffff);
 	
@@ -82,17 +82,17 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 	// when the mouse moves, we change the color image:
 	float pct = (float)x / (float)ofGetWidth();
@@ -109,31 +109,31 @@ void testApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/gl/textureExample/src/testApp.h b/examples/gl/textureExample/src/ofApp.h
similarity index 95%
rename from examples/gl/textureExample/src/testApp.h
rename to examples/gl/textureExample/src/ofApp.h
index ae87ffbd21c..e41bc88da25 100644
--- a/examples/gl/textureExample/src/testApp.h
+++ b/examples/gl/textureExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/gl/textureScreengrabExample/src/main.cpp b/examples/gl/textureScreengrabExample/src/main.cpp
index a3e0a990037..15fe7d7cf8f 100644
--- a/examples/gl/textureScreengrabExample/src/main.cpp
+++ b/examples/gl/textureScreengrabExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/textureScreengrabExample/src/testApp.cpp b/examples/gl/textureScreengrabExample/src/ofApp.cpp
similarity index 82%
rename from examples/gl/textureScreengrabExample/src/testApp.cpp
rename to examples/gl/textureScreengrabExample/src/ofApp.cpp
index aba9373fa3b..558f702ab06 100644
--- a/examples/gl/textureScreengrabExample/src/testApp.cpp
+++ b/examples/gl/textureScreengrabExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	counter = 0;
 	ofSetCircleResolution(100);
 	texScreen.allocate(300,300,GL_RGB);
@@ -11,13 +11,13 @@ void testApp::setup(){
  
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	counter += 1;
 }
 
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	// 1st, draw on screen:
 	ofSetHexColor(0x66CC33);	
@@ -70,46 +70,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gl/textureScreengrabExample/src/testApp.h b/examples/gl/textureScreengrabExample/src/ofApp.h
similarity index 93%
rename from examples/gl/textureScreengrabExample/src/testApp.h
rename to examples/gl/textureScreengrabExample/src/ofApp.h
index 0a2e2d0a91d..2fface88aa8 100644
--- a/examples/gl/textureScreengrabExample/src/testApp.h
+++ b/examples/gl/textureScreengrabExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/gl/vboExample/src/main.cpp b/examples/gl/vboExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/vboExample/src/main.cpp
+++ b/examples/gl/vboExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/vboExample/src/testApp.cpp b/examples/gl/vboExample/src/ofApp.cpp
similarity index 85%
rename from examples/gl/vboExample/src/testApp.cpp
rename to examples/gl/vboExample/src/ofApp.cpp
index 7b8239968d3..5e21ede0fea 100644
--- a/examples/gl/vboExample/src/testApp.cpp
+++ b/examples/gl/vboExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 /*
  This code demonstrates the difference between using an ofMesh and an ofVboMesh.
@@ -12,27 +12,27 @@
  vertices, or texture coordinates.
  */
 //--------------------------------------------------------------
-void testApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c) {
+void ofApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c) {
 	mesh.addVertex(a);
 	mesh.addVertex(b);
 	mesh.addVertex(c);
 }
 
 //--------------------------------------------------------------
-void testApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c, ofVec3f d) {
+void ofApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c, ofVec3f d) {
 	addFace(mesh, a, b, c);
 	addFace(mesh, a, c, d);
 }
 
 //--------------------------------------------------------------
-void testApp::addTexCoords(ofMesh& mesh, ofVec2f a, ofVec2f b, ofVec2f c) {
+void ofApp::addTexCoords(ofMesh& mesh, ofVec2f a, ofVec2f b, ofVec2f c) {
 	mesh.addTexCoord(a);
 	mesh.addTexCoord(b);
 	mesh.addTexCoord(c);
 }
 
 //--------------------------------------------------------------
-void testApp::addTexCoords(ofMesh& mesh, ofVec2f a, ofVec2f b, ofVec2f c, ofVec2f d) {
+void ofApp::addTexCoords(ofMesh& mesh, ofVec2f a, ofVec2f b, ofVec2f c, ofVec2f d) {
 	addTexCoords(mesh, a, b, c);
 	addTexCoords(mesh, a, c, d);
 }
@@ -42,7 +42,7 @@ void testApp::addTexCoords(ofMesh& mesh, ofVec2f a, ofVec2f b, ofVec2f c, ofVec2
  a 3d point from the current x,y image position.
  */
 //--------------------------------------------------------------
-ofVec3f testApp::getVertexFromImg(ofImage& img, int x, int y) {
+ofVec3f ofApp::getVertexFromImg(ofImage& img, int x, int y) {
 	ofColor color = img.getColor(x, y);
 	if(color.a > 0) {
 		float z = ofMap(color.a, 0, 255, -480, 480);
@@ -53,7 +53,7 @@ ofVec3f testApp::getVertexFromImg(ofImage& img, int x, int y) {
 }
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 
     #ifdef TARGET_OPENGLES
     // While this will will work on normal OpenGL as well, it is 
@@ -114,12 +114,12 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofBackgroundGradient(ofColor(64), ofColor(0));
 	cam.begin();
 	ofEnableDepthTest();
@@ -159,48 +159,48 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if(key == ' ') {
 		ofToggleFullscreen();
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/gl/vboExample/src/testApp.h b/examples/gl/vboExample/src/ofApp.h
similarity index 96%
rename from examples/gl/vboExample/src/testApp.h
rename to examples/gl/vboExample/src/ofApp.h
index 71121addd77..2f36b7d8ada 100644
--- a/examples/gl/vboExample/src/testApp.h
+++ b/examples/gl/vboExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/gl/vboMeshDrawInstancedExample/bin/data/shaders/instanced.vert b/examples/gl/vboMeshDrawInstancedExample/bin/data/shaders/instanced.vert
index 8352412647c..e459eb43d81 100644
--- a/examples/gl/vboMeshDrawInstancedExample/bin/data/shaders/instanced.vert
+++ b/examples/gl/vboMeshDrawInstancedExample/bin/data/shaders/instanced.vert
@@ -31,7 +31,7 @@ uniform mat4 modelViewMatrix;
 uniform mat4 modelViewProjectionMatrix;
 uniform vec4 globalColor = vec4(1.0);
 uniform	sampler2D tex0;			// we use this to sample depth data for our boxes.
-uniform float timeValue=0.0;	// we get this from our testApp, it's a time value moving from 0 to 1 every 30 seconds
+uniform float timeValue=0.0;	// we get this from our ofApp, it's a time value moving from 0 to 1 every 30 seconds
 
 
 in vec4  position;
diff --git a/examples/gl/vboMeshDrawInstancedExample/bin/data/shaders/instanced_120.vert b/examples/gl/vboMeshDrawInstancedExample/bin/data/shaders/instanced_120.vert
index 1c190e66dc1..87a306d4e51 100644
--- a/examples/gl/vboMeshDrawInstancedExample/bin/data/shaders/instanced_120.vert
+++ b/examples/gl/vboMeshDrawInstancedExample/bin/data/shaders/instanced_120.vert
@@ -29,7 +29,7 @@
 
 uniform vec4 globalColor = vec4(1.0);
 uniform	sampler2D tex0;			// we use this to sample depth data for our boxes.
-uniform float timeValue=0.0;	// we get this from our testApp, it's a time value moving from 0 to 1 every 30 seconds
+uniform float timeValue=0.0;	// we get this from our ofApp, it's a time value moving from 0 to 1 every 30 seconds
 
 varying vec4 colorVarying;
 
diff --git a/examples/gl/vboMeshDrawInstancedExample/src/main.cpp b/examples/gl/vboMeshDrawInstancedExample/src/main.cpp
index ffd29b332eb..204330b04bf 100644
--- a/examples/gl/vboMeshDrawInstancedExample/src/main.cpp
+++ b/examples/gl/vboMeshDrawInstancedExample/src/main.cpp
@@ -1,13 +1,13 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 
-// by default this example will run in OpenGL 2.0, see testApp.h for running it
+// by default this example will run in OpenGL 2.0, see ofApp.h for running it
 // in OpenGL 3.2
 
 #ifdef USE_PROGRAMMABLE_GL
 // tig: using the programmable GL renderer is more fun, since we can use GLSL 150 =)
-// define USE_PROGRAMMABLE_GL in testApp.h to run this example in OpenGL 3.2 if your
+// define USE_PROGRAMMABLE_GL in ofApp.h to run this example in OpenGL 3.2 if your
 // system provides it...
 #include "ofGLProgrammableRenderer.h"
 #endif
@@ -29,6 +29,6 @@ if( glDrawElementsInstanced == 0 ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp(new testApp());
+	ofRunApp(new ofApp());
 
 }
diff --git a/examples/gl/vboMeshDrawInstancedExample/src/testApp.cpp b/examples/gl/vboMeshDrawInstancedExample/src/ofApp.cpp
similarity index 90%
rename from examples/gl/vboMeshDrawInstancedExample/src/testApp.cpp
rename to examples/gl/vboMeshDrawInstancedExample/src/ofApp.cpp
index d23e5176da1..c14a575c374 100644
--- a/examples/gl/vboMeshDrawInstancedExample/src/testApp.cpp
+++ b/examples/gl/vboMeshDrawInstancedExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 /**
  * tig: This example shows how to draw instanced geometry using 
@@ -12,7 +12,7 @@
  */
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	// initialize variables:
 	
@@ -50,7 +50,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	if (isShaderDirty){
 		
@@ -83,7 +83,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	ofEnableDepthTest();
 	// we don't care about alpha blending in this example, and by default alpha blending is on in openFrameworks > 0.8.0
@@ -124,12 +124,12 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 	switch (key) {
 		case ' ':
@@ -145,36 +145,36 @@ void testApp::keyReleased(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 	
 }
diff --git a/examples/gl/vboMeshDrawInstancedExample/src/testApp.h b/examples/gl/vboMeshDrawInstancedExample/src/ofApp.h
similarity index 93%
rename from examples/gl/vboMeshDrawInstancedExample/src/testApp.h
rename to examples/gl/vboMeshDrawInstancedExample/src/ofApp.h
index 4e90f03ae45..d943d2a508d 100644
--- a/examples/gl/vboMeshDrawInstancedExample/src/testApp.h
+++ b/examples/gl/vboMeshDrawInstancedExample/src/ofApp.h
@@ -6,12 +6,12 @@
 // #define USE_PROGRAMMABLE_GL
 
 // note that if you use programmable GL, a different set of shaders will be loaded.
-// see testApp.cpp
+// see ofApp.cpp
 
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	ofVboMesh	mVboBox;
 	
diff --git a/examples/gl/viewportExample/src/main.cpp b/examples/gl/viewportExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/gl/viewportExample/src/main.cpp
+++ b/examples/gl/viewportExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gl/viewportExample/src/testApp.cpp b/examples/gl/viewportExample/src/ofApp.cpp
similarity index 83%
rename from examples/gl/viewportExample/src/testApp.cpp
rename to examples/gl/viewportExample/src/ofApp.cpp
index cde6107992a..e8352776b5e 100644
--- a/examples/gl/viewportExample/src/testApp.cpp
+++ b/examples/gl/viewportExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 // Viewports are useful for when you want
 //	to display different items of content
@@ -18,19 +18,19 @@
 //	matrices.
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(90);
 	randomizeViewports();
 	ofEnableSmoothing();
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	//--
 	// 2d view
@@ -82,7 +82,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::randomize(ofRectangle & viewport){
+void ofApp::randomize(ofRectangle & viewport){
 	// utlitly function to randomise a rectangle
 	viewport.x = ofRandom(ofGetWidth() * 2.0f / 3.0f);
 	viewport.y = ofRandom(ofGetHeight() * 2.0f / 3.0f);
@@ -91,13 +91,13 @@ void testApp::randomize(ofRectangle & viewport){
 }
 
 //--------------------------------------------------------------
-void testApp::randomizeViewports(){
+void ofApp::randomizeViewports(){
 	randomize(viewport2D);
 	randomize(viewport3D);
 }
 
 //--------------------------------------------------------------
-void testApp::drawViewportOutline(const ofRectangle & viewport){
+void ofApp::drawViewportOutline(const ofRectangle & viewport){
 	ofPushStyle();
 	ofFill();
 	ofSetColor(50);
@@ -112,48 +112,48 @@ void testApp::drawViewportOutline(const ofRectangle & viewport){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if(key == ' '){
 		randomizeViewports();
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/gl/viewportExample/src/testApp.h b/examples/gl/viewportExample/src/ofApp.h
similarity index 94%
rename from examples/gl/viewportExample/src/testApp.h
rename to examples/gl/viewportExample/src/ofApp.h
index b24ebdeaf4e..f067d6dc7ab 100644
--- a/examples/gl/viewportExample/src/testApp.h
+++ b/examples/gl/viewportExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/gles/customEGLWindowSettings/src/main.cpp b/examples/gles/customEGLWindowSettings/src/main.cpp
index 4c6d1de7d11..eb5f07123eb 100644
--- a/examples/gles/customEGLWindowSettings/src/main.cpp
+++ b/examples/gles/customEGLWindowSettings/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofAppEGLWindow.h"
 
 //========================================================================
@@ -18,6 +18,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gles/customEGLWindowSettings/src/testApp.cpp b/examples/gles/customEGLWindowSettings/src/ofApp.cpp
similarity index 54%
rename from examples/gles/customEGLWindowSettings/src/testApp.cpp
rename to examples/gles/customEGLWindowSettings/src/ofApp.cpp
index c5b903a84ef..8601bd0d8c5 100644
--- a/examples/gles/customEGLWindowSettings/src/testApp.cpp
+++ b/examples/gles/customEGLWindowSettings/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 	
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofSetLogLevel(OF_LOG_VERBOSE);
 
 
@@ -11,18 +11,18 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
-    ofLogVerbose("testApp") << "exit()";
+void ofApp::exit(){
+    ofLogVerbose("ofApp") << "exit()";
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     angle += 3;
     angle = angle % 360;
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
     ofBackground(255,0);
 
 
@@ -45,46 +45,46 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
-    ofLogVerbose("testApp") << "keyPressed() key = " << key;
+void ofApp::keyPressed(int key){
+    ofLogVerbose("ofApp") << "keyPressed() key = " << key;
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
-    ofLogVerbose("testApp") << "keyReleased() key = " << key;
+void ofApp::keyReleased(int key){
+    ofLogVerbose("ofApp") << "keyReleased() key = " << key;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
-    ofLogVerbose("testApp") << "mouseMoved() x = " << x << "/" << y;
+void ofApp::mouseMoved(int x, int y ){
+    ofLogVerbose("ofApp") << "mouseMoved() x = " << x << "/" << y;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
-    ofLogVerbose("testApp") << "mouseDragged() x = " << x << "/" << y << " button=" << button;
+void ofApp::mouseDragged(int x, int y, int button){
+    ofLogVerbose("ofApp") << "mouseDragged() x = " << x << "/" << y << " button=" << button;
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
-    ofLogVerbose("testApp") << "mousePressed() x = " << x << "/" << y << " button=" << button;
+void ofApp::mousePressed(int x, int y, int button){
+    ofLogVerbose("ofApp") << "mousePressed() x = " << x << "/" << y << " button=" << button;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
-    ofLogVerbose("testApp") << "mouseReleased() x = " << x << "/" << y << " button=" << button;
+void ofApp::mouseReleased(int x, int y, int button){
+    ofLogVerbose("ofApp") << "mouseReleased() x = " << x << "/" << y << " button=" << button;
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
-    ofLogVerbose("testApp") << "windowResized() w = " << w  << " h = " << h;
+void ofApp::windowResized(int w, int h){
+    ofLogVerbose("ofApp") << "windowResized() w = " << w  << " h = " << h;
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
-    ofLogVerbose("testApp") << "gotMessage() msg.message = " << msg.message;
+void ofApp::gotMessage(ofMessage msg){
+    ofLogVerbose("ofApp") << "gotMessage() msg.message = " << msg.message;
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
-    ofLogVerbose("testApp") << "dragEvent()";
+void ofApp::dragEvent(ofDragInfo dragInfo){
+    ofLogVerbose("ofApp") << "dragEvent()";
 }
diff --git a/examples/gles/customEGLWindowSettings/src/testApp.h b/examples/gles/customEGLWindowSettings/src/ofApp.h
similarity index 93%
rename from examples/gles/customEGLWindowSettings/src/testApp.h
rename to examples/gles/customEGLWindowSettings/src/ofApp.h
index 14b0312aad2..09d3f7ab3ce 100644
--- a/examples/gles/customEGLWindowSettings/src/testApp.h
+++ b/examples/gles/customEGLWindowSettings/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	
 public:
 	void setup();
diff --git a/examples/graphics/blendingExample/src/main.cpp b/examples/graphics/blendingExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/blendingExample/src/main.cpp
+++ b/examples/graphics/blendingExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/blendingExample/src/testApp.cpp b/examples/graphics/blendingExample/src/ofApp.cpp
similarity index 79%
rename from examples/graphics/blendingExample/src/testApp.cpp
rename to examples/graphics/blendingExample/src/ofApp.cpp
index 2fc71add0be..8c9c57ffb26 100644
--- a/examples/graphics/blendingExample/src/testApp.cpp
+++ b/examples/graphics/blendingExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	 
+void ofApp::setup(){	 
     alpha = 0;
 	counter = 0;
 
@@ -16,7 +16,7 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	counter = counter + 0.033f;
 
     alpha += 0.01;
@@ -25,7 +25,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
     sprintf(timeString, "Press 1 - 5 to switch blend modes");
 	
@@ -55,7 +55,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 
     switch (key) {
         case 49:
@@ -84,41 +84,41 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/graphics/blendingExample/src/testApp.h b/examples/graphics/blendingExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/blendingExample/src/testApp.h
rename to examples/graphics/blendingExample/src/ofApp.h
index 4927f18ae94..76515914d7c 100644
--- a/examples/graphics/blendingExample/src/testApp.h
+++ b/examples/graphics/blendingExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/graphics/color/src/main.cpp b/examples/graphics/color/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/color/src/main.cpp
+++ b/examples/graphics/color/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/color/src/testApp.cpp b/examples/graphics/color/src/ofApp.cpp
similarity index 91%
rename from examples/graphics/color/src/testApp.cpp
rename to examples/graphics/color/src/ofApp.cpp
index 7138f916a97..90c20354d6e 100644
--- a/examples/graphics/color/src/testApp.cpp
+++ b/examples/graphics/color/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(0,0,0);
     ofEnableSmoothing();
     ofEnableAlphaBlending();
@@ -18,11 +18,11 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     
     // here we demonstrate setting colors using HSB (Hue/Saturation/Brightness) rather than the 
     // more well-known RGB (Red/Green/Blue).
@@ -113,46 +113,46 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased  (int key){
+void ofApp::keyReleased  (int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
     // update mouse x and y percent when the mouse moves
     mouseXPercent = float(x) / ofGetWidth();
     mouseYPercent = float(y) / ofGetHeight();
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/graphics/color/src/testApp.h b/examples/graphics/color/src/ofApp.h
similarity index 94%
rename from examples/graphics/color/src/testApp.h
rename to examples/graphics/color/src/ofApp.h
index 077b5a097ef..2078a11327e 100644
--- a/examples/graphics/color/src/testApp.h
+++ b/examples/graphics/color/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/graphics/colorsExtended/src/main.cpp b/examples/graphics/colorsExtended/src/main.cpp
index 5fdea5b3291..404a0bbe99b 100644
--- a/examples/graphics/colorsExtended/src/main.cpp
+++ b/examples/graphics/colorsExtended/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -8,6 +8,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/colorsExtended/src/testApp.cpp b/examples/graphics/colorsExtended/src/ofApp.cpp
similarity index 95%
rename from examples/graphics/colorsExtended/src/testApp.cpp
rename to examples/graphics/colorsExtended/src/ofApp.cpp
index a569269e460..fe8f1642f35 100644
--- a/examples/graphics/colorsExtended/src/testApp.cpp
+++ b/examples/graphics/colorsExtended/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 bool compareName( const colorNameMapping& s1, const colorNameMapping& s2 ) {
     return strcasecmp( s1.name.c_str(), s2.name.c_str() ) <= 0;
@@ -17,7 +17,7 @@ bool compareSaturation( const colorNameMapping& s1, const colorNameMapping& s2 )
 }
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     
     // build a map from name to ofColor of all the named OF colors;
 
@@ -196,7 +196,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     
     // smoothing the mouse a bit over time
 
@@ -205,7 +205,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     
     // calculate the total size needed to display all the colors
     
@@ -242,7 +242,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     
     if (key == '1'){
         if (sortedType != 1){
@@ -268,41 +268,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/graphics/colorsExtended/src/testApp.h b/examples/graphics/colorsExtended/src/ofApp.h
similarity index 95%
rename from examples/graphics/colorsExtended/src/testApp.h
rename to examples/graphics/colorsExtended/src/ofApp.h
index e7dfb7be07e..378755e441f 100644
--- a/examples/graphics/colorsExtended/src/testApp.h
+++ b/examples/graphics/colorsExtended/src/ofApp.h
@@ -10,7 +10,7 @@ typedef struct {
     ofColor color;
 } colorNameMapping;
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/graphics/floatingPointImageExample/src/main.cpp b/examples/graphics/floatingPointImageExample/src/main.cpp
index 1d5a3a121e3..5b2786511bf 100644
--- a/examples/graphics/floatingPointImageExample/src/main.cpp
+++ b/examples/graphics/floatingPointImageExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -8,6 +8,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/floatingPointImageExample/src/testApp.cpp b/examples/graphics/floatingPointImageExample/src/ofApp.cpp
similarity index 75%
rename from examples/graphics/floatingPointImageExample/src/testApp.cpp
rename to examples/graphics/floatingPointImageExample/src/ofApp.cpp
index c992b9fc7b0..fd3f95f6287 100644
--- a/examples/graphics/floatingPointImageExample/src/testApp.cpp
+++ b/examples/graphics/floatingPointImageExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //Some helper functions
 //--------------------------------------------------------------
-void testApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c) {
+void ofApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c) {
 	ofVec3f normal = ((b - a).cross(c - a)).normalize();
 	mesh.addNormal(normal);
 	mesh.addVertex(a);
@@ -13,18 +13,18 @@ void testApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c) {
 }
 
 //--------------------------------------------------------------
-void testApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c, ofVec3f d) {
+void ofApp::addFace(ofMesh& mesh, ofVec3f a, ofVec3f b, ofVec3f c, ofVec3f d) {
 	addFace(mesh, a, b, c);
 	addFace(mesh, a, c, d);
 }
 
 //--------------------------------------------------------------
-ofVec3f testApp::getVertexFromImg(ofFloatImage& img, int x, int y) {
+ofVec3f ofApp::getVertexFromImg(ofFloatImage& img, int x, int y) {
 	return ofVec3f(x, y, 100 * img.getColor(x, y).getBrightness());
 }
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	//note: you can get nicer anti-aliased rendering ( with slower fps ) 
 	//if you uncomment the appropriate line in main.cpp
@@ -51,12 +51,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackground(0);
 	
 	easyCam.begin();
@@ -71,46 +71,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/graphics/floatingPointImageExample/src/testApp.h b/examples/graphics/floatingPointImageExample/src/ofApp.h
similarity index 95%
rename from examples/graphics/floatingPointImageExample/src/testApp.h
rename to examples/graphics/floatingPointImageExample/src/ofApp.h
index a6216f03724..2ca789113ef 100644
--- a/examples/graphics/floatingPointImageExample/src/testApp.h
+++ b/examples/graphics/floatingPointImageExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/graphics/fontShapesExample/src/main.cpp b/examples/graphics/fontShapesExample/src/main.cpp
index a382c8929c5..0645d593d1c 100644
--- a/examples/graphics/fontShapesExample/src/main.cpp
+++ b/examples/graphics/fontShapesExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/fontShapesExample/src/testApp.cpp b/examples/graphics/fontShapesExample/src/ofApp.cpp
similarity index 85%
rename from examples/graphics/fontShapesExample/src/testApp.cpp
rename to examples/graphics/fontShapesExample/src/ofApp.cpp
index 8f1191b5faf..2d1b78f765d 100644
--- a/examples/graphics/fontShapesExample/src/testApp.cpp
+++ b/examples/graphics/fontShapesExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
 
 	testFont.loadFont("Batang.ttf", 160, true, true, true);
@@ -13,12 +13,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetColor(0, 90, 60);
 	ofFill();
 
@@ -84,45 +84,45 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 	if(key==OF_KEY_ESC) return;
 	testChar = testFont.getCharacterAsPoints(key);
 	letter = key;
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased  (int key){
+void ofApp::keyReleased  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/graphics/fontShapesExample/src/testApp.h b/examples/graphics/fontShapesExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/fontShapesExample/src/testApp.h
rename to examples/graphics/fontShapesExample/src/ofApp.h
index 621c1d29cf8..9d4a33c54fa 100644
--- a/examples/graphics/fontShapesExample/src/testApp.h
+++ b/examples/graphics/fontShapesExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/graphics/fontsExample/src/main.cpp b/examples/graphics/fontsExample/src/main.cpp
index 31444cedc8c..541d9f8a2b6 100644
--- a/examples/graphics/fontsExample/src/main.cpp
+++ b/examples/graphics/fontsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/fontsExample/src/testApp.cpp b/examples/graphics/fontsExample/src/ofApp.cpp
similarity index 89%
rename from examples/graphics/fontsExample/src/testApp.cpp
rename to examples/graphics/fontsExample/src/ofApp.cpp
index 155091ccd58..01b9e26bfe0 100644
--- a/examples/graphics/fontsExample/src/testApp.cpp
+++ b/examples/graphics/fontsExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	 
+void ofApp::setup(){	 
 	ofBackground(54, 54, 54, 255);
 	
 	//old OF default is 96 - but this results in fonts looking larger than in other programs. 
@@ -33,12 +33,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	ofSetColor(225);
 	verdana14.drawString("Font Example - use keyboard to type", 30, 35);
@@ -122,7 +122,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){ 
+void ofApp::keyPressed(int key){ 
 
 	if(key == OF_KEY_DEL || key == OF_KEY_BACKSPACE){
 		typeStr = typeStr.substr(0, typeStr.length()-1);
@@ -139,41 +139,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/graphics/fontsExample/src/testApp.h b/examples/graphics/fontsExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/fontsExample/src/testApp.h
rename to examples/graphics/fontsExample/src/ofApp.h
index b9acacd7050..8ec0f354dcf 100644
--- a/examples/graphics/fontsExample/src/testApp.h
+++ b/examples/graphics/fontsExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/graphics/graphicsExample/src/main.cpp b/examples/graphics/graphicsExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/graphicsExample/src/main.cpp
+++ b/examples/graphics/graphicsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/graphicsExample/src/testApp.cpp b/examples/graphics/graphicsExample/src/ofApp.cpp
similarity index 85%
rename from examples/graphics/graphicsExample/src/testApp.cpp
rename to examples/graphics/graphicsExample/src/ofApp.cpp
index e969af77367..0510c0ad4dd 100644
--- a/examples/graphics/graphicsExample/src/testApp.cpp
+++ b/examples/graphics/graphicsExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	counter = 0;
 	ofSetCircleResolution(50);
 	ofBackground(255,255,255);
@@ -13,12 +13,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	counter = counter + 0.033f;
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	//--------------------------- circles
 	//let's draw a circle:
@@ -79,7 +79,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 	if (key == 's'){
 		bSmooth = !bSmooth;
         if (bSmooth){
@@ -91,40 +91,40 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased  (int key){
+void ofApp::keyReleased  (int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/graphics/graphicsExample/src/testApp.h b/examples/graphics/graphicsExample/src/ofApp.h
similarity index 93%
rename from examples/graphics/graphicsExample/src/testApp.h
rename to examples/graphics/graphicsExample/src/ofApp.h
index 7b532b5fbb8..640200a3a0b 100644
--- a/examples/graphics/graphicsExample/src/testApp.h
+++ b/examples/graphics/graphicsExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/graphics/imageCompressionExample/src/main.cpp b/examples/graphics/imageCompressionExample/src/main.cpp
index 6a6dd0e6b7d..10d2ab212e7 100644
--- a/examples/graphics/imageCompressionExample/src/main.cpp
+++ b/examples/graphics/imageCompressionExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/imageCompressionExample/src/testApp.cpp b/examples/graphics/imageCompressionExample/src/ofApp.cpp
similarity index 83%
rename from examples/graphics/imageCompressionExample/src/testApp.cpp
rename to examples/graphics/imageCompressionExample/src/ofApp.cpp
index 6f72130cf37..4339aa8d8b6 100644
--- a/examples/graphics/imageCompressionExample/src/testApp.cpp
+++ b/examples/graphics/imageCompressionExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	quality = OF_IMAGE_QUALITY_WORST;
 	maxSize = 2048;
 	glitchStart = .6;
@@ -9,7 +9,7 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::reset() {
+void ofApp::reset() {
 	generation = 0;
 	img.loadImage("buses.jpg");
 	// pick random for bleeding
@@ -20,7 +20,7 @@ void testApp::reset() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	string curFilename = "compressed.jpg";
 
 	int size = img.getWidth();
@@ -65,7 +65,7 @@ void testApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofSetColor(255);
 	img.draw(0, 0, ofGetWidth(), ofGetHeight());
 
@@ -77,46 +77,46 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased  (int key){
+void ofApp::keyReleased  (int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	reset();
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/graphics/imageCompressionExample/src/testApp.h b/examples/graphics/imageCompressionExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/imageCompressionExample/src/testApp.h
rename to examples/graphics/imageCompressionExample/src/ofApp.h
index 46ec2b1dc6e..0524ce37b89 100644
--- a/examples/graphics/imageCompressionExample/src/testApp.h
+++ b/examples/graphics/imageCompressionExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void reset();
 		
diff --git a/examples/graphics/imageLoaderExample/src/main.cpp b/examples/graphics/imageLoaderExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/imageLoaderExample/src/main.cpp
+++ b/examples/graphics/imageLoaderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/imageLoaderExample/src/testApp.cpp b/examples/graphics/imageLoaderExample/src/ofApp.cpp
similarity index 83%
rename from examples/graphics/imageLoaderExample/src/testApp.cpp
rename to examples/graphics/imageLoaderExample/src/ofApp.cpp
index 9a8d239d2ef..f0220cf6b71 100644
--- a/examples/graphics/imageLoaderExample/src/testApp.cpp
+++ b/examples/graphics/imageLoaderExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	bikers.loadImage("images/bikers.jpg");
 	gears.loadImage("images/gears.gif");
 	tdf.loadImage("images/tdf_1972_poster.jpg");
@@ -16,12 +16,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(255);	
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){	
+void ofApp::draw(){	
 	ofSetColor(255);
 
 	bikers.draw(0, 0);
@@ -69,46 +69,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/graphics/imageLoaderExample/src/testApp.h b/examples/graphics/imageLoaderExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/imageLoaderExample/src/testApp.h
rename to examples/graphics/imageLoaderExample/src/ofApp.h
index 30df76b602f..706e8e66ffb 100644
--- a/examples/graphics/imageLoaderExample/src/testApp.h
+++ b/examples/graphics/imageLoaderExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/graphics/imageLoaderWebExample/src/main.cpp b/examples/graphics/imageLoaderWebExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/imageLoaderWebExample/src/main.cpp
+++ b/examples/graphics/imageLoaderWebExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/imageLoaderWebExample/src/testApp.cpp b/examples/graphics/imageLoaderWebExample/src/ofApp.cpp
similarity index 78%
rename from examples/graphics/imageLoaderWebExample/src/testApp.cpp
rename to examples/graphics/imageLoaderWebExample/src/ofApp.cpp
index fa98da80fcd..ef3b25a1ba1 100644
--- a/examples/graphics/imageLoaderWebExample/src/testApp.cpp
+++ b/examples/graphics/imageLoaderWebExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	mouseX = 100;
 	loading=false;
 	ofRegisterURLNotification(this);
@@ -11,7 +11,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::urlResponse(ofHttpResponse & response){
+void ofApp::urlResponse(ofHttpResponse & response){
 	if(response.status==200 && response.request.name == "tsingy_forest"){
 		img.loadImage(response.data);
 		loading=false;
@@ -22,12 +22,12 @@ void testApp::urlResponse(ofHttpResponse & response){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	ofSetColor(0, 0, 0);
 	ofDrawBitmapString("hit spacebar to load image from web", 10, ofGetHeight()/2);
@@ -51,53 +51,53 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::exit() {
+void ofApp::exit() {
 	ofUnregisterURLNotification(this);
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	img.clear();
 	ofLoadURLAsync("http://images.wildmadagascar.org/pictures/bemaraha/tsingy_forest.JPG","tsingy_forest");
 	loading =true;
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/graphics/imageLoaderWebExample/src/testApp.h b/examples/graphics/imageLoaderWebExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/imageLoaderWebExample/src/testApp.h
rename to examples/graphics/imageLoaderWebExample/src/ofApp.h
index 93daf4044a2..3ff9cbdc0fc 100644
--- a/examples/graphics/imageLoaderWebExample/src/testApp.h
+++ b/examples/graphics/imageLoaderWebExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofURLFileLoader.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/graphics/imageSaverExample/src/main.cpp b/examples/graphics/imageSaverExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/imageSaverExample/src/main.cpp
+++ b/examples/graphics/imageSaverExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/imageSaverExample/src/testApp.cpp b/examples/graphics/imageSaverExample/src/ofApp.cpp
similarity index 81%
rename from examples/graphics/imageSaverExample/src/testApp.cpp
rename to examples/graphics/imageSaverExample/src/ofApp.cpp
index a0910207aa6..fddcaa372b4 100644
--- a/examples/graphics/imageSaverExample/src/testApp.cpp
+++ b/examples/graphics/imageSaverExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	snapCounter = 0;
 	bSnapshot = false;
 	cooper.loadFont("cooperBlack.ttf", 50);
@@ -12,13 +12,13 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(255,255,255);
 }
 
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	phase += 0.35f;
 
@@ -73,49 +73,49 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 	if (key == 'x'){
 		bSnapshot = true;
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/graphics/imageSaverExample/src/testApp.h b/examples/graphics/imageSaverExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/imageSaverExample/src/testApp.h
rename to examples/graphics/imageSaverExample/src/ofApp.h
index f1d954f7e9c..39910676f80 100644
--- a/examples/graphics/imageSaverExample/src/testApp.h
+++ b/examples/graphics/imageSaverExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/graphics/imageSequenceExample/src/main.cpp b/examples/graphics/imageSequenceExample/src/main.cpp
index dfea555a48b..71062dd8b4b 100644
--- a/examples/graphics/imageSequenceExample/src/main.cpp
+++ b/examples/graphics/imageSequenceExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/imageSequenceExample/src/testApp.cpp b/examples/graphics/imageSequenceExample/src/ofApp.cpp
similarity index 89%
rename from examples/graphics/imageSequenceExample/src/testApp.cpp
rename to examples/graphics/imageSequenceExample/src/ofApp.cpp
index 98becf64a91..8529f5c3967 100644
--- a/examples/graphics/imageSequenceExample/src/testApp.cpp
+++ b/examples/graphics/imageSequenceExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 /*
@@ -20,7 +20,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
     
     ofBackground(0);
     ofSetWindowTitle("The Moon is made of plops");
@@ -60,12 +60,12 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
     
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
     
     // we need some images if not return
     if((int)images.size() <= 0) {
@@ -122,7 +122,7 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     
     
     if(key == OF_KEY_UP)      appFPS ++;
@@ -139,41 +139,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
     
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
     
 }
diff --git a/examples/graphics/imageSequenceExample/src/testApp.h b/examples/graphics/imageSequenceExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/imageSequenceExample/src/testApp.h
rename to examples/graphics/imageSequenceExample/src/ofApp.h
index df8ce58ba16..561e01d0c21 100644
--- a/examples/graphics/imageSequenceExample/src/testApp.h
+++ b/examples/graphics/imageSequenceExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
     
 public:
     
diff --git a/examples/graphics/imageSubsectionExample/src/main.cpp b/examples/graphics/imageSubsectionExample/src/main.cpp
index dd9d21f7bba..da6718b24da 100644
--- a/examples/graphics/imageSubsectionExample/src/main.cpp
+++ b/examples/graphics/imageSubsectionExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/imageSubsectionExample/src/testApp.cpp b/examples/graphics/imageSubsectionExample/src/ofApp.cpp
similarity index 80%
rename from examples/graphics/imageSubsectionExample/src/testApp.cpp
rename to examples/graphics/imageSubsectionExample/src/ofApp.cpp
index fc205142432..31145227d5d 100644
--- a/examples/graphics/imageSubsectionExample/src/testApp.cpp
+++ b/examples/graphics/imageSubsectionExample/src/ofApp.cpp
@@ -1,19 +1,19 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	img.loadImage("indispensable.jpg");
 	ofSetLineWidth(2);
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackground(ofColor::black);
 	
 	// draw the original image
@@ -58,46 +58,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/graphics/imageSubsectionExample/src/testApp.h b/examples/graphics/imageSubsectionExample/src/ofApp.h
similarity index 93%
rename from examples/graphics/imageSubsectionExample/src/testApp.h
rename to examples/graphics/imageSubsectionExample/src/ofApp.h
index 5144de2ab56..beb1c009ec8 100644
--- a/examples/graphics/imageSubsectionExample/src/testApp.h
+++ b/examples/graphics/imageSubsectionExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/graphics/lutFilterExample/src/main.cpp b/examples/graphics/lutFilterExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/lutFilterExample/src/main.cpp
+++ b/examples/graphics/lutFilterExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/lutFilterExample/src/testApp.cpp b/examples/graphics/lutFilterExample/src/ofApp.cpp
similarity index 87%
rename from examples/graphics/lutFilterExample/src/testApp.cpp
rename to examples/graphics/lutFilterExample/src/ofApp.cpp
index cfd10c9de31..8193edff819 100644
--- a/examples/graphics/lutFilterExample/src/testApp.cpp
+++ b/examples/graphics/lutFilterExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	dir.allowExt("cube");
 	dir.listDir("LUTs/");
 	dir.sort();
@@ -27,7 +27,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	vidGrabber.update();
 	
 	if (doLUT) {
@@ -38,7 +38,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackgroundGradient(ofColor::gray, ofColor::black);
 	
 	ofTranslate(ofGetWidth()*0.5f, ofGetHeight()*0.5f, 0);
@@ -59,7 +59,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::loadLUT(string path){
+void ofApp::loadLUT(string path){
 	LUTloaded=false;
 	
 	ofFile file(path);
@@ -81,7 +81,7 @@ void testApp::loadLUT(string path){
 	LUTloaded = true;
 }
 //--------------------------------------------------------------
-void testApp::applyLUT(ofPixelsRef pix){
+void ofApp::applyLUT(ofPixelsRef pix){
 	if (LUTloaded) {
 		
 		for(int y = 0; y < pix.getHeight(); y++){
@@ -116,12 +116,12 @@ void testApp::applyLUT(ofPixelsRef pix){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	switch (key) {
 		case ' ':
 			doLUT^=true;
@@ -147,22 +147,22 @@ void testApp::keyReleased(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
diff --git a/examples/graphics/lutFilterExample/src/testApp.h b/examples/graphics/lutFilterExample/src/ofApp.h
similarity index 94%
rename from examples/graphics/lutFilterExample/src/testApp.h
rename to examples/graphics/lutFilterExample/src/ofApp.h
index fed7df1e80d..c35a18992f9 100644
--- a/examples/graphics/lutFilterExample/src/testApp.h
+++ b/examples/graphics/lutFilterExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 public:
 	void setup();
diff --git a/examples/graphics/pdfExample/src/main.cpp b/examples/graphics/pdfExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/pdfExample/src/main.cpp
+++ b/examples/graphics/pdfExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/pdfExample/src/testApp.cpp b/examples/graphics/pdfExample/src/ofApp.cpp
similarity index 90%
rename from examples/graphics/pdfExample/src/testApp.cpp
rename to examples/graphics/pdfExample/src/ofApp.cpp
index a613ecccde9..b4758510f0e 100644
--- a/examples/graphics/pdfExample/src/testApp.cpp
+++ b/examples/graphics/pdfExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	angle = 0;
 	oneShot = false;
@@ -23,12 +23,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	angle++;
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	if( oneShot ){
 		ofBeginSaveScreenAsPDF("screenshot-"+ofGetTimestampString()+".pdf", false);
 	}
@@ -128,7 +128,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 	if( key=='r'){
 		pdfRendering = !pdfRendering;	
@@ -147,42 +147,42 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	for(unsigned int j = 0; j < dropZoneRects.size(); j++){
 		if( dropZoneRects[j].inside( dragInfo.position ) ){
 			images[j].loadImage( dragInfo.files[0] );
diff --git a/examples/graphics/pdfExample/src/testApp.h b/examples/graphics/pdfExample/src/ofApp.h
similarity index 95%
rename from examples/graphics/pdfExample/src/testApp.h
rename to examples/graphics/pdfExample/src/ofApp.h
index 5c6f481e47e..1525ccbeebb 100644
--- a/examples/graphics/pdfExample/src/testApp.h
+++ b/examples/graphics/pdfExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/graphics/polygonExample/src/main.cpp b/examples/graphics/polygonExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/polygonExample/src/main.cpp
+++ b/examples/graphics/polygonExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/polygonExample/src/testApp.cpp b/examples/graphics/polygonExample/src/ofApp.cpp
similarity index 95%
rename from examples/graphics/polygonExample/src/testApp.cpp
rename to examples/graphics/polygonExample/src/ofApp.cpp
index de7516d7a13..c8cac7b391b 100644
--- a/examples/graphics/polygonExample/src/testApp.cpp
+++ b/examples/graphics/polygonExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofBackground(255,255,255);	
 	ofSetFrameRate(60);
 	
@@ -30,11 +30,11 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofFill();
 	ofSetHexColor(0xe0be21);
 
@@ -398,16 +398,16 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //------------- -------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	for (int i = 0; i < nCurveVertices; i++){
 		float diffx = x - curveVertices[i].x;
 		float diffy = y - curveVertices[i].y;
@@ -421,7 +421,7 @@ void testApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	for (int i = 0; i < nCurveVertices; i++){
 		if (curveVertices[i].bBeingDragged == true){
 			curveVertices[i].x = x;
@@ -431,7 +431,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	for (int i = 0; i < nCurveVertices; i++){
 		float diffx = x - curveVertices[i].x;
 		float diffy = y - curveVertices[i].y;
@@ -445,7 +445,7 @@ void testApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 	for (int i = 0; i < nCurveVertices; i++){
 		curveVertices[i].bBeingDragged = false;	
@@ -453,16 +453,16 @@ void testApp::mouseReleased(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/graphics/polygonExample/src/testApp.h b/examples/graphics/polygonExample/src/ofApp.h
similarity index 95%
rename from examples/graphics/polygonExample/src/testApp.h
rename to examples/graphics/polygonExample/src/ofApp.h
index b7422b348af..e4eafc879b3 100644
--- a/examples/graphics/polygonExample/src/testApp.h
+++ b/examples/graphics/polygonExample/src/ofApp.h
@@ -13,7 +13,7 @@ typedef struct {
 }draggableVertex;
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/graphics/polylineBlobsExample/src/main.cpp b/examples/graphics/polylineBlobsExample/src/main.cpp
index d50a844b8f8..b156efd6462 100644
--- a/examples/graphics/polylineBlobsExample/src/main.cpp
+++ b/examples/graphics/polylineBlobsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/polylineBlobsExample/src/testApp.cpp b/examples/graphics/polylineBlobsExample/src/ofApp.cpp
similarity index 88%
rename from examples/graphics/polylineBlobsExample/src/testApp.cpp
rename to examples/graphics/polylineBlobsExample/src/ofApp.cpp
index 6225fd536b5..20749a32fad 100644
--- a/examples/graphics/polylineBlobsExample/src/testApp.cpp
+++ b/examples/graphics/polylineBlobsExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	threshold = 32;
 	
 	camWidth = 640;
@@ -15,7 +15,7 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	ofSetLogLevel(OF_LOG_VERBOSE);
 
 	cam.update();
@@ -80,7 +80,7 @@ void drawWithNormals(const ofPolyline& polyline) {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofBackground(0);
 	
 	ofSetColor(255);
@@ -114,46 +114,46 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	threshold = x;
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/graphics/polylineBlobsExample/src/testApp.h b/examples/graphics/polylineBlobsExample/src/ofApp.h
similarity index 95%
rename from examples/graphics/polylineBlobsExample/src/testApp.h
rename to examples/graphics/polylineBlobsExample/src/ofApp.h
index 05243907823..08251dbc683 100644
--- a/examples/graphics/polylineBlobsExample/src/testApp.h
+++ b/examples/graphics/polylineBlobsExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxOpenCv.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/graphics/rectangleAlignmentAndScaling/src/main.cpp b/examples/graphics/rectangleAlignmentAndScaling/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/rectangleAlignmentAndScaling/src/main.cpp
+++ b/examples/graphics/rectangleAlignmentAndScaling/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/rectangleAlignmentAndScaling/src/testApp.cpp b/examples/graphics/rectangleAlignmentAndScaling/src/ofApp.cpp
similarity index 93%
rename from examples/graphics/rectangleAlignmentAndScaling/src/testApp.cpp
rename to examples/graphics/rectangleAlignmentAndScaling/src/ofApp.cpp
index c0fe9f580e5..a7ff8613de5 100644
--- a/examples/graphics/rectangleAlignmentAndScaling/src/testApp.cpp
+++ b/examples/graphics/rectangleAlignmentAndScaling/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
     // This example is designed to show all of the different aligning
     // and scaling functions available in ofRectangle.
@@ -49,7 +49,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     
     workingSubjectRect = subjectRect;
 
@@ -89,7 +89,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackground(0);
 
     // draw original subject in lower left-hand corner
@@ -149,7 +149,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     
     // define keyboard interactions
     if(key == ' ') {
@@ -196,7 +196,7 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::makeNewSubject() {
+void ofApp::makeNewSubject() {
     // if we are not using an image, make a random subject rectangle
     if(!bUseImage) {
         subjectRect.setFromCenter(ofGetWidth()  / 2.0f,
@@ -217,7 +217,7 @@ void testApp::makeNewSubject() {
 }
 
 //--------------------------------------------------------------
-void testApp::makeNewTarget() {
+void ofApp::makeNewTarget() {
     
     // create a random target rectangle aligned to the center of the screen
     targetRect.setFromCenter(ofGetWidth()  / 2.0f,
@@ -227,7 +227,7 @@ void testApp::makeNewTarget() {
 }
 
 //--------------------------------------------------------------
-void testApp::drawAlignRect(const ofRectangle& rect,
+void ofApp::drawAlignRect(const ofRectangle& rect,
                             const ofColor& color,
                             ofAlignHorz hAlign,
                             ofAlignVert vAlign,
@@ -255,7 +255,7 @@ void testApp::drawAlignRect(const ofRectangle& rect,
 }
 
 //--------------------------------------------------------------
-void testApp::drawHorzAlignMark(const ofRectangle& rect, const ofColor& color, ofAlignHorz hAlign) {
+void ofApp::drawHorzAlignMark(const ofRectangle& rect, const ofColor& color, ofAlignHorz hAlign) {
     if(hAlign != OF_ALIGN_HORZ_IGNORE) {
         float hAnchor = rect.getHorzAnchor(hAlign);
         ofSetColor(color,120);
@@ -265,7 +265,7 @@ void testApp::drawHorzAlignMark(const ofRectangle& rect, const ofColor& color, o
 }
 
 //--------------------------------------------------------------
-void testApp::drawVertAlignMark(const ofRectangle& rect, const ofColor& color, ofAlignVert vAlign) {
+void ofApp::drawVertAlignMark(const ofRectangle& rect, const ofColor& color, ofAlignVert vAlign) {
     if(vAlign != OF_ALIGN_VERT_IGNORE) {
         float vAnchor = rect.getVertAnchor(vAlign);
         ofSetColor(color,120);
@@ -275,7 +275,7 @@ void testApp::drawVertAlignMark(const ofRectangle& rect, const ofColor& color, o
 }
 
 //--------------------------------------------------------------
-ofScaleMode testApp::getNextScaleMode(ofScaleMode mode) {
+ofScaleMode ofApp::getNextScaleMode(ofScaleMode mode) {
     if(mode == OF_SCALEMODE_FIT) {
         mode = OF_SCALEMODE_FILL;
     } else if(mode == OF_SCALEMODE_FILL) {
@@ -289,7 +289,7 @@ ofScaleMode testApp::getNextScaleMode(ofScaleMode mode) {
 }
 
 //--------------------------------------------------------------
-ofAspectRatioMode testApp::getNextAspectRatioMode(ofAspectRatioMode mode) {
+ofAspectRatioMode ofApp::getNextAspectRatioMode(ofAspectRatioMode mode) {
     if(mode == OF_ASPECT_RATIO_IGNORE) {
         mode = OF_ASPECT_RATIO_KEEP;
     } else if(mode == OF_ASPECT_RATIO_KEEP) {
@@ -302,7 +302,7 @@ ofAspectRatioMode testApp::getNextAspectRatioMode(ofAspectRatioMode mode) {
 
 
 //--------------------------------------------------------------
-ofAlignHorz testApp::getNextHorzAlign(ofAlignHorz hAlign) {
+ofAlignHorz ofApp::getNextHorzAlign(ofAlignHorz hAlign) {
     if(hAlign == OF_ALIGN_HORZ_LEFT) {
         hAlign = OF_ALIGN_HORZ_CENTER;
     } else if(hAlign == OF_ALIGN_HORZ_CENTER) {
@@ -314,7 +314,7 @@ ofAlignHorz testApp::getNextHorzAlign(ofAlignHorz hAlign) {
 }
 
 //--------------------------------------------------------------
-ofAlignVert testApp::getNextVertAlign(ofAlignVert vAlign) {
+ofAlignVert ofApp::getNextVertAlign(ofAlignVert vAlign) {
     if(vAlign == OF_ALIGN_VERT_TOP) {
         vAlign = OF_ALIGN_VERT_CENTER;
     } else if(vAlign == OF_ALIGN_VERT_CENTER) {
@@ -326,7 +326,7 @@ ofAlignVert testApp::getNextVertAlign(ofAlignVert vAlign) {
 }
 
 //--------------------------------------------------------------
-string testApp::getHorzAlignString(ofAlignHorz hAlign) {
+string ofApp::getHorzAlignString(ofAlignHorz hAlign) {
     switch (hAlign) {
         case OF_ALIGN_HORZ_LEFT:
             return "OF_ALIGN_HORZ_LEFT";
@@ -343,7 +343,7 @@ string testApp::getHorzAlignString(ofAlignHorz hAlign) {
 }
 
 //--------------------------------------------------------------
-string testApp::getVertAlignString(ofAlignVert vAlign) {
+string ofApp::getVertAlignString(ofAlignVert vAlign) {
     switch (vAlign) {
         case OF_ALIGN_VERT_TOP:
             return "OF_ALIGN_VERT_TOP";
@@ -360,7 +360,7 @@ string testApp::getVertAlignString(ofAlignVert vAlign) {
 }
 
 //--------------------------------------------------------------
-string testApp::getAspectRatioModeString(ofAspectRatioMode mode) {
+string ofApp::getAspectRatioModeString(ofAspectRatioMode mode) {
     switch (mode) {
         case OF_ASPECT_RATIO_IGNORE:
             return "OF_ASPECT_RATIO_IGNORE";
@@ -375,7 +375,7 @@ string testApp::getAspectRatioModeString(ofAspectRatioMode mode) {
 }
 
 //--------------------------------------------------------------
-string testApp::getScaleModeString(ofScaleMode mode) {
+string ofApp::getScaleModeString(ofScaleMode mode) {
     switch (mode) {
         case OF_SCALEMODE_FIT:
             return "OF_SCALEMODE_FIT";
diff --git a/examples/graphics/rectangleAlignmentAndScaling/src/testApp.h b/examples/graphics/rectangleAlignmentAndScaling/src/ofApp.h
similarity index 98%
rename from examples/graphics/rectangleAlignmentAndScaling/src/testApp.h
rename to examples/graphics/rectangleAlignmentAndScaling/src/ofApp.h
index dd70b1a8aa1..e6cbb451a00 100644
--- a/examples/graphics/rectangleAlignmentAndScaling/src/testApp.h
+++ b/examples/graphics/rectangleAlignmentAndScaling/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/graphics/simpleColorKey/src/main.cpp b/examples/graphics/simpleColorKey/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/graphics/simpleColorKey/src/main.cpp
+++ b/examples/graphics/simpleColorKey/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/graphics/simpleColorKey/src/testApp.cpp b/examples/graphics/simpleColorKey/src/ofApp.cpp
similarity index 78%
rename from examples/graphics/simpleColorKey/src/testApp.cpp
rename to examples/graphics/simpleColorKey/src/ofApp.cpp
index f69d55b0c74..90f60113bbf 100644
--- a/examples/graphics/simpleColorKey/src/testApp.cpp
+++ b/examples/graphics/simpleColorKey/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     
     //load the image object
     original.loadImage("myImage.jpg");
@@ -27,12 +27,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     //no need to use this
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     
     //draw the image every frame, the changes you made in setup() will be there
     original.draw(0,0);
@@ -41,7 +41,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if(key == 's'){
 		//we can save out the modified version here
 		keyed.saveImage("keyed_image.png");
@@ -49,41 +49,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/graphics/simpleColorKey/src/testApp.h b/examples/graphics/simpleColorKey/src/ofApp.h
similarity index 95%
rename from examples/graphics/simpleColorKey/src/testApp.h
rename to examples/graphics/simpleColorKey/src/ofApp.h
index 81d80e82ade..f47c6f11a89 100644
--- a/examples/graphics/simpleColorKey/src/testApp.h
+++ b/examples/graphics/simpleColorKey/src/ofApp.h
@@ -13,7 +13,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
   public:
     void setup();
diff --git a/examples/gui/guiExample/src/main.cpp b/examples/gui/guiExample/src/main.cpp
index b0edd90d341..cf76611188a 100644
--- a/examples/gui/guiExample/src/main.cpp
+++ b/examples/gui/guiExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gui/guiExample/src/testApp.cpp b/examples/gui/guiExample/src/ofApp.cpp
similarity index 75%
rename from examples/gui/guiExample/src/testApp.cpp
rename to examples/gui/guiExample/src/ofApp.cpp
index 1efe0043057..06a6d1326d4 100644
--- a/examples/gui/guiExample/src/testApp.cpp
+++ b/examples/gui/guiExample/src/ofApp.cpp
@@ -1,13 +1,13 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 	
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 
 	// we add this listener before setting up so the initial circle resolution is correct
-	circleResolution.addListener(this, &testApp::circleResolutionChanged);
-	ringButton.addListener(this,&testApp::ringButtonPressed);
+	circleResolution.addListener(this, &ofApp::circleResolutionChanged);
+	ringButton.addListener(this,&ofApp::ringButtonPressed);
 
 	gui.setup(); // most of the time you don't need a name
 	gui.add(filled.setup("fill", true));
@@ -25,27 +25,27 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
-	ringButton.removeListener(this,&testApp::ringButtonPressed);
+void ofApp::exit(){
+	ringButton.removeListener(this,&ofApp::ringButtonPressed);
 }
 
 //--------------------------------------------------------------
-void testApp::circleResolutionChanged(int & circleResolution){
+void ofApp::circleResolutionChanged(int & circleResolution){
 	ofSetCircleResolution(circleResolution);
 }
 
 //--------------------------------------------------------------
-void testApp::ringButtonPressed(){
+void ofApp::ringButtonPressed(){
 	ring.play();
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofSetCircleResolution(circleResolution);
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackgroundGradient(ofColor::white, ofColor::gray);
     
 	if( filled ){
@@ -70,7 +70,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if( key == 'h' ){
 		bHide = !bHide;
 	}
@@ -86,40 +86,40 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
     screenSize = ofToString(w) + "x" + ofToString(h);
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/gui/guiExample/src/testApp.h b/examples/gui/guiExample/src/ofApp.h
similarity index 95%
rename from examples/gui/guiExample/src/testApp.h
rename to examples/gui/guiExample/src/ofApp.h
index 2ccbaa13345..a7a6190a815 100644
--- a/examples/gui/guiExample/src/testApp.h
+++ b/examples/gui/guiExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxGui.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 public:
 	void setup();
diff --git a/examples/gui/guiFromParametersExample/src/main.cpp b/examples/gui/guiFromParametersExample/src/main.cpp
index 701f8f8f33e..84ca57fc68a 100644
--- a/examples/gui/guiFromParametersExample/src/main.cpp
+++ b/examples/gui/guiFromParametersExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -8,6 +8,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gui/guiFromParametersExample/src/testApp.cpp b/examples/gui/guiFromParametersExample/src/ofApp.cpp
similarity index 74%
rename from examples/gui/guiFromParametersExample/src/testApp.cpp
rename to examples/gui/guiFromParametersExample/src/ofApp.cpp
index af3981f54f9..39d3b3a6500 100644
--- a/examples/gui/guiFromParametersExample/src/testApp.cpp
+++ b/examples/gui/guiFromParametersExample/src/ofApp.cpp
@@ -1,13 +1,13 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 	
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	
 	// we add this listener before setting up so the initial circle resolution is correct
-	circleResolution.addListener(this, &testApp::circleResolutionChanged);
-	ringButton.addListener(this,&testApp::ringButtonPressed);
+	circleResolution.addListener(this, &ofApp::circleResolutionChanged);
+	ringButton.addListener(this,&ofApp::ringButtonPressed);
 
 	gui.setup("panel"); // most of the time you don't need a name but don't forget to call setup
 	gui.add(filled.set("bFill", true));
@@ -25,26 +25,26 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
-	ringButton.removeListener(this,&testApp::ringButtonPressed);
+void ofApp::exit(){
+	ringButton.removeListener(this,&ofApp::ringButtonPressed);
 }
 
 //--------------------------------------------------------------
-void testApp::circleResolutionChanged(int & circleResolution){
+void ofApp::circleResolutionChanged(int & circleResolution){
 	ofSetCircleResolution(circleResolution);
 }
 
 //--------------------------------------------------------------
-void testApp::ringButtonPressed(){
+void ofApp::ringButtonPressed(){
 	ring.play();
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackgroundGradient(ofColor::white, ofColor::gray);
     
 	if( filled ){
@@ -67,7 +67,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if( key == 'h' ){
 		bHide = !bHide;
 	}
@@ -83,40 +83,40 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
     screenSize = ofToString(w) + "x" + ofToString(h);
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/gui/guiFromParametersExample/src/testApp.h b/examples/gui/guiFromParametersExample/src/ofApp.h
similarity index 96%
rename from examples/gui/guiFromParametersExample/src/testApp.h
rename to examples/gui/guiFromParametersExample/src/ofApp.h
index e52f933ff30..b0dfae516ad 100644
--- a/examples/gui/guiFromParametersExample/src/testApp.h
+++ b/examples/gui/guiFromParametersExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxGui.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 public:
 	void setup();
diff --git a/examples/gui/oscParametersReceiver/src/main.cpp b/examples/gui/oscParametersReceiver/src/main.cpp
index ab54c233b76..8da2b168e4e 100644
--- a/examples/gui/oscParametersReceiver/src/main.cpp
+++ b/examples/gui/oscParametersReceiver/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -8,6 +8,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gui/oscParametersReceiver/src/testApp.cpp b/examples/gui/oscParametersReceiver/src/ofApp.cpp
similarity index 74%
rename from examples/gui/oscParametersReceiver/src/testApp.cpp
rename to examples/gui/oscParametersReceiver/src/ofApp.cpp
index 50e704c70c5..a707e815525 100644
--- a/examples/gui/oscParametersReceiver/src/testApp.cpp
+++ b/examples/gui/oscParametersReceiver/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	parameters.setName("parameters");
 	parameters.add(size.set("size",10,0,100));
 	parameters.add(number.set("number",10,0,100));
@@ -14,12 +14,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	sync.update();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	gui.draw();
 	ofSetColor(color);
 	for(int i=0;i<number;i++){
@@ -28,46 +28,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gui/oscParametersReceiver/src/testApp.h b/examples/gui/oscParametersReceiver/src/ofApp.h
similarity index 95%
rename from examples/gui/oscParametersReceiver/src/testApp.h
rename to examples/gui/oscParametersReceiver/src/ofApp.h
index 63a50f119c4..3aff59359c9 100644
--- a/examples/gui/oscParametersReceiver/src/testApp.h
+++ b/examples/gui/oscParametersReceiver/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxGui.h"
 #include "ofxOscParameterSync.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/gui/oscParametersSender/src/main.cpp b/examples/gui/oscParametersSender/src/main.cpp
index ab54c233b76..8da2b168e4e 100644
--- a/examples/gui/oscParametersSender/src/main.cpp
+++ b/examples/gui/oscParametersSender/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -8,6 +8,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gui/oscParametersSender/src/testApp.cpp b/examples/gui/oscParametersSender/src/ofApp.cpp
similarity index 74%
rename from examples/gui/oscParametersSender/src/testApp.cpp
rename to examples/gui/oscParametersSender/src/ofApp.cpp
index 332102141c2..6b16b6b476e 100644
--- a/examples/gui/oscParametersSender/src/testApp.cpp
+++ b/examples/gui/oscParametersSender/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	parameters.setName("parameters");
 	parameters.add(size.set("size",10,1,100));
 	parameters.add(number.set("number",10,1,100));
@@ -14,12 +14,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	sync.update();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	gui.draw();
 	ofSetColor(color);
 	for(int i=0;i<number;i++){
@@ -29,46 +29,46 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gui/oscParametersSender/src/testApp.h b/examples/gui/oscParametersSender/src/ofApp.h
similarity index 95%
rename from examples/gui/oscParametersSender/src/testApp.h
rename to examples/gui/oscParametersSender/src/ofApp.h
index 731a7ac64ec..110c0ec1acb 100644
--- a/examples/gui/oscParametersSender/src/testApp.h
+++ b/examples/gui/oscParametersSender/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxOscParameterSync.h"
 #include "ofxGui.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/gui/parameterEdgeCasesExample/src/main.cpp b/examples/gui/parameterEdgeCasesExample/src/main.cpp
index ab54c233b76..8da2b168e4e 100644
--- a/examples/gui/parameterEdgeCasesExample/src/main.cpp
+++ b/examples/gui/parameterEdgeCasesExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -8,6 +8,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gui/parameterEdgeCasesExample/src/testApp.cpp b/examples/gui/parameterEdgeCasesExample/src/ofApp.cpp
similarity index 80%
rename from examples/gui/parameterEdgeCasesExample/src/testApp.cpp
rename to examples/gui/parameterEdgeCasesExample/src/ofApp.cpp
index 1b8bd99171b..2f1e9e35a4b 100644
--- a/examples/gui/parameterEdgeCasesExample/src/testApp.cpp
+++ b/examples/gui/parameterEdgeCasesExample/src/ofApp.cpp
@@ -1,9 +1,9 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	color.set("color",ofColor(127),ofColor(0,0),ofColor(255,255));
-	color.addListener(this,&testApp::colorChanged);
+	color.addListener(this,&ofApp::colorChanged);
 
 	color = ofColor(255);
 	cout << color.getName() << ": " << color << endl; // color: 255, 255, 255, 255
@@ -56,64 +56,64 @@ void testApp::setup(){
 
 }
 
-void testApp::incrementParam(ofParameter<int> p){
+void ofApp::incrementParam(ofParameter<int> p){
 	p++;
 }
 
-void testApp::colorChanged(ofColor & color){
+void ofApp::colorChanged(ofColor & color){
 	cout << "colorChanged event: " << color << endl;
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gui/parameterEdgeCasesExample/src/testApp.h b/examples/gui/parameterEdgeCasesExample/src/ofApp.h
similarity index 94%
rename from examples/gui/parameterEdgeCasesExample/src/testApp.h
rename to examples/gui/parameterEdgeCasesExample/src/ofApp.h
index 6ae37f1d4a6..34ce095fdcd 100644
--- a/examples/gui/parameterEdgeCasesExample/src/testApp.h
+++ b/examples/gui/parameterEdgeCasesExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/gui/parameterGroupExample/src/main.cpp b/examples/gui/parameterGroupExample/src/main.cpp
index 701f8f8f33e..84ca57fc68a 100644
--- a/examples/gui/parameterGroupExample/src/main.cpp
+++ b/examples/gui/parameterGroupExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -8,6 +8,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/gui/parameterGroupExample/src/testApp.cpp b/examples/gui/parameterGroupExample/src/ofApp.cpp
similarity index 78%
rename from examples/gui/parameterGroupExample/src/testApp.cpp
rename to examples/gui/parameterGroupExample/src/ofApp.cpp
index 1d4f6edbad8..93a33ef54c9 100644
--- a/examples/gui/parameterGroupExample/src/testApp.cpp
+++ b/examples/gui/parameterGroupExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	renderer1.setup("renderer1");
 	renderer2.setup("renderer2");
 
@@ -18,20 +18,20 @@ void testApp::setup(){
 	ofEnableAlphaBlending();
 }
 
-void testApp::vSyncChanged(bool & vSync){
+void ofApp::vSyncChanged(bool & vSync){
 	ofSetVerticalSync(vSync);
 }
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	// frameNum is a readonly parameter so this will fail to compile
 	// unless we are inside the CirclesRenderer class
 	// renderer.frameNum = 5;
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackgroundGradient(ofColor::white, ofColor::gray);
 	renderer1.draw();
 	renderer2.draw();
@@ -42,7 +42,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if(key=='s'){
 		settings.serialize(parameters);
 		settings.save("settings.xml");
@@ -62,41 +62,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/gui/parameterGroupExample/src/testApp.h b/examples/gui/parameterGroupExample/src/ofApp.h
similarity index 95%
rename from examples/gui/parameterGroupExample/src/testApp.h
rename to examples/gui/parameterGroupExample/src/ofApp.h
index 5eb448345ec..ee8a523aaff 100644
--- a/examples/gui/parameterGroupExample/src/testApp.h
+++ b/examples/gui/parameterGroupExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxGui.h"
 #include "CirclesRenderer.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/ios/3DPrimitivesExample/src/main.mm b/examples/ios/3DPrimitivesExample/src/main.mm
index 9481ab721e5..41523730af8 100644
--- a/examples/ios/3DPrimitivesExample/src/main.mm
+++ b/examples/ios/3DPrimitivesExample/src/main.mm
@@ -1,10 +1,10 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
     ofAppiOSWindow * iOSWindow = new ofAppiOSWindow();
     iOSWindow->enableDepthBuffer();
     ofSetupOpenGL(iOSWindow, 1024, 768, OF_FULLSCREEN);
     
-    ofRunApp(new testApp);
+    ofRunApp(new ofApp);
 }
diff --git a/examples/ios/3DPrimitivesExample/src/testApp.h b/examples/ios/3DPrimitivesExample/src/ofApp.h
similarity index 96%
rename from examples/ios/3DPrimitivesExample/src/testApp.h
rename to examples/ios/3DPrimitivesExample/src/ofApp.h
index 53d989f8d48..e036bd504b4 100755
--- a/examples/ios/3DPrimitivesExample/src/testApp.h
+++ b/examples/ios/3DPrimitivesExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
 public:
     void setup();
diff --git a/examples/ios/3DPrimitivesExample/src/testApp.mm b/examples/ios/3DPrimitivesExample/src/ofApp.mm
similarity index 96%
rename from examples/ios/3DPrimitivesExample/src/testApp.mm
rename to examples/ios/3DPrimitivesExample/src/ofApp.mm
index c3d0602b423..5b7f8ec40a1 100755
--- a/examples/ios/3DPrimitivesExample/src/testApp.mm
+++ b/examples/ios/3DPrimitivesExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	// initialize the accelerometer
 	ofxAccelerometer.setup();
 	
@@ -54,7 +54,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     pointLight.setPosition((ofGetWidth()*.5)+ cos(ofGetElapsedTimef()*.5)*(ofGetWidth()*.3), ofGetHeight()/2, 500);
     pointLight2.setPosition((ofGetWidth()*.5)+ cos(ofGetElapsedTimef()*.15)*(ofGetWidth()*.3),
                             ofGetHeight()*.5 + sin(ofGetElapsedTimef()*.7)*(ofGetHeight()), -300);
@@ -69,7 +69,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	float spinX = sin(ofGetElapsedTimef()*.35f);
     float spinY = cos(ofGetElapsedTimef()*.075f);
     
@@ -389,12 +389,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch) {
+void ofApp::touchDown(ofTouchEventArgs & touch) {
     if(touch.id==0) {
         numTouches++;
         if(numTouches > 2) numTouches=0;
@@ -429,17 +429,17 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
     mode++;
     if(mode > 2) mode = 0;
     
@@ -488,27 +488,27 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
 
diff --git a/examples/ios/CoreLocationExample/src/main.mm b/examples/ios/CoreLocationExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/CoreLocationExample/src/main.mm
+++ b/examples/ios/CoreLocationExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/CoreLocationExample/src/testApp.h b/examples/ios/CoreLocationExample/src/ofApp.h
similarity index 95%
rename from examples/ios/CoreLocationExample/src/testApp.h
rename to examples/ios/CoreLocationExample/src/ofApp.h
index 4ab9f39dfbc..908951ba7dd 100755
--- a/examples/ios/CoreLocationExample/src/testApp.h
+++ b/examples/ios/CoreLocationExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/CoreLocationExample/src/testApp.mm b/examples/ios/CoreLocationExample/src/ofApp.mm
similarity index 80%
rename from examples/ios/CoreLocationExample/src/testApp.mm
rename to examples/ios/CoreLocationExample/src/ofApp.mm
index fc301cc75cb..05602870e3c 100755
--- a/examples/ios/CoreLocationExample/src/testApp.mm
+++ b/examples/ios/CoreLocationExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(225, 225, 225);
 
 	// initialize the accelerometer
@@ -22,12 +22,12 @@
 
 
 //--------------------------------------------------------------
-void testApp::update(){	
+void ofApp::update(){	
 	heading = ofLerpDegrees(heading, -coreLocation->getTrueHeading(), 0.7);
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetColor(54);
 	ofDrawBitmapString("Core Location Example", 8, 20);
 
@@ -59,51 +59,51 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/ImagePickerExample/src/main.mm b/examples/ios/ImagePickerExample/src/main.mm
index 649ad0dd4f6..3d735b08f0b 100644
--- a/examples/ios/ImagePickerExample/src/main.mm
+++ b/examples/ios/ImagePickerExample/src/main.mm
@@ -1,9 +1,9 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/ImagePickerExample/src/testApp.h b/examples/ios/ImagePickerExample/src/ofApp.h
similarity index 95%
rename from examples/ios/ImagePickerExample/src/testApp.h
rename to examples/ios/ImagePickerExample/src/ofApp.h
index 28a1ca4ddf6..b1f777bd3cd 100755
--- a/examples/ios/ImagePickerExample/src/testApp.h
+++ b/examples/ios/ImagePickerExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/ImagePickerExample/src/testApp.mm b/examples/ios/ImagePickerExample/src/ofApp.mm
similarity index 80%
rename from examples/ios/ImagePickerExample/src/testApp.mm
rename to examples/ios/ImagePickerExample/src/ofApp.mm
index 79d8a4f8865..da546b2daec 100755
--- a/examples/ios/ImagePickerExample/src/testApp.mm
+++ b/examples/ios/ImagePickerExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
     ofBackground(0);
     
     ofSetOrientation(OF_ORIENTATION_90_RIGHT);
@@ -16,7 +16,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     if(camera) {
         if(camera->imageUpdated){
             
@@ -37,19 +37,19 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     int x = imgPos.x - photo.width / 2;
     int y = imgPos.y - photo.height / 2;
 	photo.draw(x, y);
 }
 
 //--------------------------------------------------------------
-void testApp::exit() {
+void ofApp::exit() {
 }
 
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	if(touch.id == 1){
 		
         if(!camera) {
@@ -65,7 +65,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	if(touch.id == 0){
 		imgPos.x=touch.x;
 		imgPos.y=touch.y;
@@ -73,36 +73,36 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){	
+void ofApp::touchUp(ofTouchEventArgs & touch){	
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus() {
+void ofApp::lostFocus() {
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus() {
+void ofApp::gotFocus() {
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning() {
+void ofApp::gotMemoryWarning() {
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/KeyboardExample/src/main.mm b/examples/ios/KeyboardExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/KeyboardExample/src/main.mm
+++ b/examples/ios/KeyboardExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/KeyboardExample/src/testApp.h b/examples/ios/KeyboardExample/src/ofApp.h
similarity index 94%
rename from examples/ios/KeyboardExample/src/testApp.h
rename to examples/ios/KeyboardExample/src/ofApp.h
index 42cd4eb1d39..20b7c799dfb 100755
--- a/examples/ios/KeyboardExample/src/testApp.h
+++ b/examples/ios/KeyboardExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/KeyboardExample/src/testApp.mm b/examples/ios/KeyboardExample/src/ofApp.mm
similarity index 74%
rename from examples/ios/KeyboardExample/src/testApp.mm
rename to examples/ios/KeyboardExample/src/ofApp.mm
index 2289e8a081a..c5e5b600952 100755
--- a/examples/ios/KeyboardExample/src/testApp.mm
+++ b/examples/ios/KeyboardExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	// initialize the accelerometer
 	ofxAccelerometer.setup();
 	
@@ -14,12 +14,12 @@
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
  
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){	
+void ofApp::draw(){	
 	ofSetColor(180, 180, 180, 255);
 	ofDrawBitmapString("tap the textfield to open the keyboard", 2, 10);
 
@@ -29,12 +29,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	
 	if (touch.id == 1){
 		
@@ -49,42 +49,42 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/MapKitExample/src/main.mm b/examples/ios/MapKitExample/src/main.mm
index 0244543b20b..441b873f437 100644
--- a/examples/ios/MapKitExample/src/main.mm
+++ b/examples/ios/MapKitExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main() {
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/MapKitExample/src/testApp.h b/examples/ios/MapKitExample/src/ofApp.h
similarity index 94%
rename from examples/ios/MapKitExample/src/testApp.h
rename to examples/ios/MapKitExample/src/ofApp.h
index 000e36ddb13..48984409e59 100755
--- a/examples/ios/MapKitExample/src/testApp.h
+++ b/examples/ios/MapKitExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp, ofxiOSMapKitListener{
+class ofApp : public ofxiOSApp, ofxiOSMapKitListener{
 	
     public:
         void setup();
diff --git a/examples/ios/MapKitExample/src/testApp.mm b/examples/ios/MapKitExample/src/ofApp.mm
similarity index 76%
rename from examples/ios/MapKitExample/src/testApp.mm
rename to examples/ios/MapKitExample/src/ofApp.mm
index faf50136189..6b1463e8108 100755
--- a/examples/ios/MapKitExample/src/testApp.mm
+++ b/examples/ios/MapKitExample/src/ofApp.mm
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 #define POS1_LATITUDE		40.6767
 #define POS1_LONGITUDE		-73.9722
@@ -9,7 +9,7 @@
 #define POS2_LONGITUDE		 -74.0019
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
     
     ofBackground(0, 0);
     
@@ -30,7 +30,7 @@
 	// set initial position to specified coordinates, and cover 1000 Km x 1000 Km area
 	mapKit.setRegionWithMeters(POS2_LATITUDE, POS2_LONGITUDE, 1000, 1000);
 
-	// optionally add testApp as a listener for map event (callbacks below)
+	// optionally add ofApp as a listener for map event (callbacks below)
 	mapKit.addListener(this);
 	
 	// set other optional parameters
@@ -51,13 +51,13 @@
 	ofxiOSSetGLViewTransparent(true);
 	
 	// Now that the OpenGL view is in front of the mapview, it will receive all the touch events, so we cannot interact with the map
-	// So disable interaction with the OpenGL view (testApp::touchXXXXX will not be called)
+	// So disable interaction with the OpenGL view (ofApp::touchXXXXX will not be called)
 	ofxiOSSetGLViewUserInteraction(false);
 }
 
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	if(mapKit.isOpen()) {
 //		printf("User is %son screen\n", mapKit.isUserOnScreen() ? "" : "not ");
 	}
@@ -65,7 +65,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	
 	// if mapKit is open....
 	if(mapKit.isOpen()) {
@@ -102,77 +102,77 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::regionWillChange(bool animated){
-	printf("testApp::regionWillChange | animated: %i\n", animated);
+void ofApp::regionWillChange(bool animated){
+	printf("ofApp::regionWillChange | animated: %i\n", animated);
 }
 
 //--------------------------------------------------------------
-void testApp::regionDidChange(bool animated){
-	printf("testApp::regionDidChange | animated: %i\n", animated);
+void ofApp::regionDidChange(bool animated){
+	printf("ofApp::regionDidChange | animated: %i\n", animated);
 }
 
 //--------------------------------------------------------------
-void testApp::willStartLoadingMap(){
-	printf("testApp::willStartLoadingMap\n");
+void ofApp::willStartLoadingMap(){
+	printf("ofApp::willStartLoadingMap\n");
 }
 
 //--------------------------------------------------------------
-void testApp::didFinishLoadingMap(){
-	printf("testApp::didFinishLoadingMap\n");
+void ofApp::didFinishLoadingMap(){
+	printf("ofApp::didFinishLoadingMap\n");
 }
 
 //--------------------------------------------------------------
-void testApp::errorLoadingMap(string errorDescription){
-	printf("testApp::errorLoadingMap : %s\n", errorDescription.c_str());
+void ofApp::errorLoadingMap(string errorDescription){
+	printf("ofApp::errorLoadingMap : %s\n", errorDescription.c_str());
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/TouchAndAccelExample/src/main.mm b/examples/ios/TouchAndAccelExample/src/main.mm
index d0d384123d8..42e794fe0c0 100644
--- a/examples/ios/TouchAndAccelExample/src/main.mm
+++ b/examples/ios/TouchAndAccelExample/src/main.mm
@@ -1,7 +1,7 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/TouchAndAccelExample/src/testApp.h b/examples/ios/TouchAndAccelExample/src/ofApp.h
similarity index 95%
rename from examples/ios/TouchAndAccelExample/src/testApp.h
rename to examples/ios/TouchAndAccelExample/src/ofApp.h
index 9854f81acc5..7c6d078298a 100755
--- a/examples/ios/TouchAndAccelExample/src/testApp.h
+++ b/examples/ios/TouchAndAccelExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofxiOSExtras.h"
 #include "Ball.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/TouchAndAccelExample/src/testApp.mm b/examples/ios/TouchAndAccelExample/src/ofApp.mm
similarity index 81%
rename from examples/ios/TouchAndAccelExample/src/testApp.mm
rename to examples/ios/TouchAndAccelExample/src/ofApp.mm
index a7dd045c427..2e29e63a010 100755
--- a/examples/ios/TouchAndAccelExample/src/testApp.mm
+++ b/examples/ios/TouchAndAccelExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofBackground(225, 225, 225);
 	ofSetCircleResolution(80);
     ofSetLogLevel(OF_LOG_VERBOSE);
@@ -22,7 +22,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	for(int i=0; i < balls.size(); i++){
 		balls[i].update();
 	}
@@ -30,7 +30,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofSetColor(54);
 	ofDrawBitmapString("Multitouch and Accel Example", 10, 20);
 
@@ -53,62 +53,62 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
     ofLog(OF_LOG_VERBOSE, "touch %d down at (%d,%d)", touch.id, touch.x, touch.y);
 	balls[touch.id].moveTo(touch.x, touch.y);
 	balls[touch.id].bDragged = true;
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
     ofLog(OF_LOG_VERBOSE, "touch %d moved at (%d,%d)", touch.id, touch.x, touch.y);
 	balls[touch.id].moveTo(touch.x, touch.y);
 	balls[touch.id].bDragged = true;	
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
     ofLog(OF_LOG_VERBOSE, "touch %d up at (%d,%d)", touch.id, touch.x, touch.y);
 	balls[touch.id].bDragged = false;
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
     ofLog(OF_LOG_VERBOSE, "touch %d double tap at (%d,%d)", touch.id, touch.x, touch.y);
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
diff --git a/examples/ios/advancedEventsExample/src/main.mm b/examples/ios/advancedEventsExample/src/main.mm
index 40f8cc2a50c..9b12bb120fe 100644
--- a/examples/ios/advancedEventsExample/src/main.mm
+++ b/examples/ios/advancedEventsExample/src/main.mm
@@ -1,9 +1,9 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp());
+	ofRunApp(new ofApp());
 }
diff --git a/examples/ios/advancedEventsExample/src/testApp.h b/examples/ios/advancedEventsExample/src/ofApp.h
similarity index 96%
rename from examples/ios/advancedEventsExample/src/testApp.h
rename to examples/ios/advancedEventsExample/src/ofApp.h
index bfa333c5f1d..f0180d7cdc6 100755
--- a/examples/ios/advancedEventsExample/src/testApp.h
+++ b/examples/ios/advancedEventsExample/src/ofApp.h
@@ -6,7 +6,7 @@
 
 #include "eventsObject.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
     
     public:
         void setup();
diff --git a/examples/ios/advancedEventsExample/src/testApp.mm b/examples/ios/advancedEventsExample/src/ofApp.mm
similarity index 69%
rename from examples/ios/advancedEventsExample/src/testApp.mm
rename to examples/ios/advancedEventsExample/src/ofApp.mm
index fdb0a037a2c..7a252e00458 100755
--- a/examples/ios/advancedEventsExample/src/testApp.mm
+++ b/examples/ios/advancedEventsExample/src/ofApp.mm
@@ -1,48 +1,48 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofBackground(50, 50, 50);
 	
     enabled = false;
 	
 	// add the newFloat method to listen for eventsAddon newFloatEvent
-	ofAddListener(evObject.newFloatEvent, this, &testApp::newFloat);
+	ofAddListener(evObject.newFloatEvent, this, &ofApp::newFloat);
 	
 	// add the newFloat method to listen for eventsAddon newFloatEvent
-	ofAddListener(evObject.newIntEvent, this, &testApp::newInt);	
+	ofAddListener(evObject.newIntEvent, this, &ofApp::newInt);	
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofDrawBitmapString(floatMsg, 20, 20);
 	ofDrawBitmapString(intMsg, 20, 40);
 	ofDrawBitmapString("click to enable/disable events", 20, 60);
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::newFloat(float & f){
+void ofApp::newFloat(float & f){
 	floatMsg = "newFloat event:  " + ofToString(f);
 	cout << floatMsg << "\n";
 }
 
 //--------------------------------------------------------------
-void testApp::newInt(int & i){
+void ofApp::newInt(int & i){
 	intMsg = "newInt   event:  " + ofToString(i);
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	if(enabled){
         evObject.disable();
     }else{
@@ -53,41 +53,41 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & args){
+void ofApp::touchCancelled(ofTouchEventArgs & args){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/advancedGraphics/src/main.mm b/examples/ios/advancedGraphics/src/main.mm
index 91f731a00c8..dac08b6755a 100644
--- a/examples/ios/advancedGraphics/src/main.mm
+++ b/examples/ios/advancedGraphics/src/main.mm
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofxiOSExtras.h"
 
 int main(){
@@ -13,5 +13,5 @@ int main(){
 	iOSWindow->enableRetina();
 	
 	ofSetupOpenGL(iOSWindow, 480, 320, OF_FULLSCREEN);
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/advancedGraphics/src/testApp.h b/examples/ios/advancedGraphics/src/ofApp.h
similarity index 95%
rename from examples/ios/advancedGraphics/src/testApp.h
rename to examples/ios/advancedGraphics/src/ofApp.h
index fc4e63e0b5c..591de47b6ef 100755
--- a/examples/ios/advancedGraphics/src/testApp.h
+++ b/examples/ios/advancedGraphics/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
     
     public:
         void setup();
diff --git a/examples/ios/advancedGraphics/src/testApp.mm b/examples/ios/advancedGraphics/src/ofApp.mm
similarity index 91%
rename from examples/ios/advancedGraphics/src/testApp.mm
rename to examples/ios/advancedGraphics/src/ofApp.mm
index 0500ac5abb3..3f7d13d6e68 100755
--- a/examples/ios/advancedGraphics/src/testApp.mm
+++ b/examples/ios/advancedGraphics/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 
 	counter = 0.0;
@@ -17,7 +17,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	//add 0.029 to our counter
 	counter = counter + 0.029f;
@@ -38,7 +38,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	//---------------------------------
 	//PIXEL OCEAN
@@ -188,17 +188,17 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	
 	if( touch.id ==  0){
         //update spinPct by the distance the mouse
@@ -225,36 +225,36 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/assimpExample/src/main.mm b/examples/ios/assimpExample/src/main.mm
index 8ca78a866af..b55c8ebebf2 100644
--- a/examples/ios/assimpExample/src/main.mm
+++ b/examples/ios/assimpExample/src/main.mm
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -12,6 +12,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/ios/assimpExample/src/testApp.h b/examples/ios/assimpExample/src/ofApp.h
similarity index 95%
rename from examples/ios/assimpExample/src/testApp.h
rename to examples/ios/assimpExample/src/ofApp.h
index 350b5224ba5..9b399037058 100644
--- a/examples/ios/assimpExample/src/testApp.h
+++ b/examples/ios/assimpExample/src/ofApp.h
@@ -8,7 +8,7 @@
 #include "ofxAssimpModelLoader.h"
 #include "ofVboMesh.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 
 	public:
 
diff --git a/examples/ios/assimpExample/src/testApp.mm b/examples/ios/assimpExample/src/ofApp.mm
similarity index 86%
rename from examples/ios/assimpExample/src/testApp.mm
rename to examples/ios/assimpExample/src/ofApp.mm
index 57da4d315ea..1f5b281ec21 100644
--- a/examples/ios/assimpExample/src/testApp.mm
+++ b/examples/ios/assimpExample/src/ofApp.mm
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofSetLogLevel(OF_LOG_VERBOSE);
     ofBackground(50, 0);
     
@@ -19,7 +19,7 @@
     loadModel(modelIndex);
 }
 
-void testApp::loadModel(int modelIndex) {
+void ofApp::loadModel(int modelIndex) {
     ofPoint modelPosition(ofGetWidth() / 2, (float)ofGetHeight() * 0.75 , 0);
     
     switch(modelIndex){
@@ -61,12 +61,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     model.update();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofSetColor(255);
     ofEnableAlphaBlending();
     
@@ -87,27 +87,27 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
     if(++modelIndex > modelsTotal - 1){
         modelIndex = 0;
 	}
@@ -115,27 +115,27 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/audioInputExample/src/main.mm b/examples/ios/audioInputExample/src/main.mm
index 778d925dce9..006033cf29b 100755
--- a/examples/ios/audioInputExample/src/main.mm
+++ b/examples/ios/audioInputExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp());
+	ofRunApp(new ofApp());
 }
diff --git a/examples/ios/audioInputExample/src/testApp.h b/examples/ios/audioInputExample/src/ofApp.h
similarity index 95%
rename from examples/ios/audioInputExample/src/testApp.h
rename to examples/ios/audioInputExample/src/ofApp.h
index 08de63c956c..3d8b9acfb01 100755
--- a/examples/ios/audioInputExample/src/testApp.h
+++ b/examples/ios/audioInputExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
 public:
 	void setup();
diff --git a/examples/ios/audioInputExample/src/testApp.mm b/examples/ios/audioInputExample/src/ofApp.mm
similarity index 83%
rename from examples/ios/audioInputExample/src/testApp.mm
rename to examples/ios/audioInputExample/src/ofApp.mm
index 9e8a5f9e82d..aef19251f4c 100755
--- a/examples/ios/audioInputExample/src/testApp.mm
+++ b/examples/ios/audioInputExample/src/ofApp.mm
@@ -1,14 +1,14 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-#include "testApp.h"
+#include "ofApp.h"
 
 //  IMPORTANT!!! if your sound doesn't work in the simulator
 //	read this post => http://www.cocos2d-iphone.org/forum/topic/4159
 //  which requires you set the input stream to 24bit!!
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     ofSetFrameRate(60);
     ofBackground(255);
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
@@ -37,12 +37,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     drawCounter++;
     
     ofPushStyle();
@@ -70,12 +70,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     //
 }
 
 //--------------------------------------------------------------
-void testApp::audioIn(float * input, int bufferSize, int nChannels){
+void ofApp::audioIn(float * input, int bufferSize, int nChannels){
 	if(initialBufferSize < bufferSize){
 		ofLog(OF_LOG_ERROR, "your buffer size was set to %i - but the stream needs a buffer size of %i", initialBufferSize, bufferSize);
 	}	
@@ -88,47 +88,47 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
     sound.setVolume(1.0);
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
     sound.setVolume(0.0);
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/audioOutputExample/src/main.mm b/examples/ios/audioOutputExample/src/main.mm
index 778d925dce9..006033cf29b 100755
--- a/examples/ios/audioOutputExample/src/main.mm
+++ b/examples/ios/audioOutputExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp());
+	ofRunApp(new ofApp());
 }
diff --git a/examples/ios/audioOutputExample/src/testApp.h b/examples/ios/audioOutputExample/src/ofApp.h
similarity index 96%
rename from examples/ios/audioOutputExample/src/testApp.h
rename to examples/ios/audioOutputExample/src/ofApp.h
index b92fab4f45d..ab3dc7106f8 100755
--- a/examples/ios/audioOutputExample/src/testApp.h
+++ b/examples/ios/audioOutputExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
 	public:
 		void setup();
diff --git a/examples/ios/audioOutputExample/src/testApp.mm b/examples/ios/audioOutputExample/src/ofApp.mm
similarity index 89%
rename from examples/ios/audioOutputExample/src/testApp.mm
rename to examples/ios/audioOutputExample/src/ofApp.mm
index 45fb2f74ad6..3e3e1cdb325 100755
--- a/examples/ios/audioOutputExample/src/testApp.mm
+++ b/examples/ios/audioOutputExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	// IMPORTANT!!! if your sound doesn't work in the simulator - read this post - which requires you set the output stream to 24bit 
 	//	http://www.cocos2d-iphone.org/forum/topic/4159
@@ -52,12 +52,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	float boxW = 200.0;
 	float boxH = boxW * 0.75;
@@ -94,12 +94,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::audioOut(float * output, int bufferSize, int nChannels){
+void ofApp::audioOut(float * output, int bufferSize, int nChannels){
 			
 	if( initialBufferSize < bufferSize ){
 		ofLog(OF_LOG_ERROR, "your buffer size was set to %i - but the stream needs a buffer size of %i", initialBufferSize, bufferSize);
@@ -135,12 +135,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	bNoise = true;
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	if(touch.id ==  0){
 		int width = ofGetWidth();
 		pan = (float)touch.x / (float)width;
@@ -152,36 +152,36 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	bNoise = false;
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 	bNoise = false;
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/dirListExample/src/main.mm b/examples/ios/dirListExample/src/main.mm
index a3e0a990037..15fe7d7cf8f 100644
--- a/examples/ios/dirListExample/src/main.mm
+++ b/examples/ios/dirListExample/src/main.mm
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/ios/dirListExample/src/testApp.h b/examples/ios/dirListExample/src/ofApp.h
similarity index 95%
rename from examples/ios/dirListExample/src/testApp.h
rename to examples/ios/dirListExample/src/ofApp.h
index e0d6cdab674..17394d47036 100644
--- a/examples/ios/dirListExample/src/testApp.h
+++ b/examples/ios/dirListExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp {
+class ofApp : public ofxiOSApp {
 
 	public:
 
diff --git a/examples/ios/dirListExample/src/testApp.mm b/examples/ios/dirListExample/src/ofApp.mm
similarity index 80%
rename from examples/ios/dirListExample/src/testApp.mm
rename to examples/ios/dirListExample/src/ofApp.mm
index 712e8f2d589..13f0721c9b7 100644
--- a/examples/ios/dirListExample/src/testApp.mm
+++ b/examples/ios/dirListExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
     nImages = DIR.listDir("images/of_logos/");
@@ -18,12 +18,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	float textSpace = 40;
 	
@@ -50,12 +50,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	if (nImages > 0){
 		currentImage++;
 		currentImage %= nImages;
@@ -63,41 +63,41 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
diff --git a/examples/ios/emptyExample/src/main.mm b/examples/ios/emptyExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/emptyExample/src/main.mm
+++ b/examples/ios/emptyExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/iosNativeExample/src/testApp.h b/examples/ios/emptyExample/src/ofApp.h
similarity index 94%
rename from examples/ios/iosNativeExample/src/testApp.h
rename to examples/ios/emptyExample/src/ofApp.h
index 7b2c9d61272..f6248f2b9e8 100755
--- a/examples/ios/iosNativeExample/src/testApp.h
+++ b/examples/ios/emptyExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/emptyExample/src/testApp.mm b/examples/ios/emptyExample/src/ofApp.mm
similarity index 63%
rename from examples/ios/emptyExample/src/testApp.mm
rename to examples/ios/emptyExample/src/ofApp.mm
index 9f511765340..df7d5ff59df 100755
--- a/examples/ios/emptyExample/src/testApp.mm
+++ b/examples/ios/emptyExample/src/ofApp.mm
@@ -1,67 +1,67 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
 
diff --git a/examples/ios/eventsExample/src/main.mm b/examples/ios/eventsExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/eventsExample/src/main.mm
+++ b/examples/ios/eventsExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/eventsExample/src/testApp.h b/examples/ios/eventsExample/src/ofApp.h
similarity index 95%
rename from examples/ios/eventsExample/src/testApp.h
rename to examples/ios/eventsExample/src/ofApp.h
index 3e739b7d1bb..e104d3cd000 100755
--- a/examples/ios/eventsExample/src/testApp.h
+++ b/examples/ios/eventsExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/eventsExample/src/testApp.mm b/examples/ios/eventsExample/src/ofApp.mm
similarity index 80%
rename from examples/ios/eventsExample/src/testApp.mm
rename to examples/ios/eventsExample/src/ofApp.mm
index 02b4e150991..1a60e025729 100755
--- a/examples/ios/eventsExample/src/testApp.mm
+++ b/examples/ios/eventsExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	// initialize the accelerometer
 	ofxAccelerometer.setup();
 	
@@ -12,12 +12,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	counter = counter + 0.033f;
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofTranslate(-60, -60, 0);
 
@@ -37,52 +37,52 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	sprintf(eventString, "touchDown = (%2.0f, %2.0f - id %i)", touch.x, touch.y, touch.id);
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	sprintf(eventString, "touchMoved = (%2.0f, %2.0f - id %i)", touch.x, touch.y, touch.id);
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	sprintf(eventString, "touchUp = (%2.0f, %2.0f - id %i)",touch.x, touch.y, touch.id);
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 	sprintf(eventString, "doubleTap at (%2.0f, %2.0f)",touch.x, touch.y);
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 	sprintf(eventString, "alert - lost focus");
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 	sprintf(eventString, "alert - got focus");
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 	sprintf(eventString, "alert - memory warning");
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 	sprintf(eventString, "alert - orientation change to %i", newOrientation);
 }
 
diff --git a/examples/ios/fontShapesExample/src/main.mm b/examples/ios/fontShapesExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/fontShapesExample/src/main.mm
+++ b/examples/ios/fontShapesExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/fontShapesExample/src/testApp.h b/examples/ios/fontShapesExample/src/ofApp.h
similarity index 95%
rename from examples/ios/fontShapesExample/src/testApp.h
rename to examples/ios/fontShapesExample/src/ofApp.h
index 4473cbb2581..0534eca95f9 100755
--- a/examples/ios/fontShapesExample/src/testApp.h
+++ b/examples/ios/fontShapesExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/fontShapesExample/src/testApp.mm b/examples/ios/fontShapesExample/src/ofApp.mm
similarity index 82%
rename from examples/ios/fontShapesExample/src/testApp.mm
rename to examples/ios/fontShapesExample/src/ofApp.mm
index 38b228167b4..acf2014d075 100755
--- a/examples/ios/fontShapesExample/src/testApp.mm
+++ b/examples/ios/fontShapesExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 	
 	ofBackground(255,255,255);	
@@ -15,12 +15,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetColor(0, 90, 60);
 	ofFill();
 
@@ -62,17 +62,17 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	if( touch.id == 0 ){
 		letter = ofMap(touch.x, 10.0, ofGetWidth(), 33, 126, true);
 		testChar = testFont.getCharacterAsPoints(letter);
@@ -80,36 +80,36 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/fontsExample/src/main.mm b/examples/ios/fontsExample/src/main.mm
index ed21aeb7b0f..5abaafc74a1 100644
--- a/examples/ios/fontsExample/src/main.mm
+++ b/examples/ios/fontsExample/src/main.mm
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofAppiOSWindow * iOSWindow = new ofAppiOSWindow();
@@ -8,5 +8,5 @@ int main(){
 	iOSWindow->enableRetina();
 	
 	ofSetupOpenGL(iOSWindow, 480, 320, OF_FULLSCREEN);
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/fontsExample/src/testApp.h b/examples/ios/fontsExample/src/ofApp.h
similarity index 96%
rename from examples/ios/fontsExample/src/testApp.h
rename to examples/ios/fontsExample/src/ofApp.h
index f9c1be7af70..9d1197ea5d6 100755
--- a/examples/ios/fontsExample/src/testApp.h
+++ b/examples/ios/fontsExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/fontsExample/src/testApp.mm b/examples/ios/fontsExample/src/ofApp.mm
similarity index 90%
rename from examples/ios/fontsExample/src/testApp.mm
rename to examples/ios/fontsExample/src/ofApp.mm
index d9d0487c1e5..0aec792ade0 100755
--- a/examples/ios/fontsExample/src/testApp.mm
+++ b/examples/ios/fontsExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofBackground(54, 54, 54, 255);
 	
 	//old OF default is 96 - but this results in fonts looking larger than in other programs. 
@@ -35,7 +35,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	//lets emmulate the snapping action
 	if( !bDragging ){
@@ -58,7 +58,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	ofPushMatrix();
 	ofTranslate(-10 + drag.x, -60 + drag.y, 0);
@@ -141,12 +141,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	if( touch.id == 0 ){
 		touchPt.x = touch.x;
 		touchPt.y = touch.y;
@@ -155,7 +155,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	if( touch.id == 0 ){
 		ofPoint pt( touch.x, touch.y );
 		drag += pt - touchPt;
@@ -165,40 +165,40 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	if( touch.id == 0 ){
 		bDragging = false;
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/graphicsExample/src/main.mm b/examples/ios/graphicsExample/src/main.mm
index d0d384123d8..42e794fe0c0 100644
--- a/examples/ios/graphicsExample/src/main.mm
+++ b/examples/ios/graphicsExample/src/main.mm
@@ -1,7 +1,7 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/graphicsExample/src/testApp.h b/examples/ios/graphicsExample/src/ofApp.h
similarity index 94%
rename from examples/ios/graphicsExample/src/testApp.h
rename to examples/ios/graphicsExample/src/ofApp.h
index a17d2ed97aa..c82a783d4a5 100755
--- a/examples/ios/graphicsExample/src/testApp.h
+++ b/examples/ios/graphicsExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/graphicsExample/src/testApp.mm b/examples/ios/graphicsExample/src/ofApp.mm
similarity index 85%
rename from examples/ios/graphicsExample/src/testApp.mm
rename to examples/ios/graphicsExample/src/ofApp.mm
index b1383268c7d..86694963a7c 100755
--- a/examples/ios/graphicsExample/src/testApp.mm
+++ b/examples/ios/graphicsExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 
 	counter = 0;
@@ -11,12 +11,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	counter = counter + 0.033f;
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofTranslate(0, -140, 0);
 	ofScale(0.7, 0.7, 1.0);
@@ -86,51 +86,51 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	bSmooth = true;
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	bSmooth = false;
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 	bSmooth = false;
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/iPhoneGuiExample/src/gui/MyGuiView.h b/examples/ios/iPhoneGuiExample/src/gui/MyGuiView.h
index 8866cebb5c0..ed836e429dc 100644
--- a/examples/ios/iPhoneGuiExample/src/gui/MyGuiView.h
+++ b/examples/ios/iPhoneGuiExample/src/gui/MyGuiView.h
@@ -8,12 +8,12 @@
 
 #import <UIKit/UIKit.h>
 
-#include "testApp.h"
+#include "ofApp.h"
 
 @interface MyGuiView : UIViewController {
 	IBOutlet UILabel *displayText;
 	
-	testApp *myApp;		// points to our instance of testApp
+	ofApp *myApp;		// points to our instance of ofApp
 }
 
 -(void)setStatusString:(NSString *)trackStr;
diff --git a/examples/ios/iPhoneGuiExample/src/gui/MyGuiView.mm b/examples/ios/iPhoneGuiExample/src/gui/MyGuiView.mm
index cec09799d0d..2acb5e05bb6 100644
--- a/examples/ios/iPhoneGuiExample/src/gui/MyGuiView.mm
+++ b/examples/ios/iPhoneGuiExample/src/gui/MyGuiView.mm
@@ -14,7 +14,7 @@ @implementation MyGuiView
 
 // called automatically after the view is loaded, can be treated like the constructor or setup() of this class
 -(void)viewDidLoad {
-	myApp = (testApp*)ofGetAppPtr();
+	myApp = (ofApp*)ofGetAppPtr();
 }
 
 //----------------------------------------------------------------
diff --git a/examples/ios/iPhoneGuiExample/src/main.mm b/examples/ios/iPhoneGuiExample/src/main.mm
index 23ad77430a7..5b320a0b63b 100644
--- a/examples/ios/iPhoneGuiExample/src/main.mm
+++ b/examples/ios/iPhoneGuiExample/src/main.mm
@@ -1,10 +1,10 @@
 
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/iPhoneGuiExample/src/testApp.h b/examples/ios/iPhoneGuiExample/src/ofApp.h
similarity index 95%
rename from examples/ios/iPhoneGuiExample/src/testApp.h
rename to examples/ios/iPhoneGuiExample/src/ofApp.h
index c949c8e2c35..b98a2ceee66 100755
--- a/examples/ios/iPhoneGuiExample/src/testApp.h
+++ b/examples/ios/iPhoneGuiExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/iPhoneGuiExample/src/testApp.mm b/examples/ios/iPhoneGuiExample/src/ofApp.mm
similarity index 79%
rename from examples/ios/iPhoneGuiExample/src/testApp.mm
rename to examples/ios/iPhoneGuiExample/src/ofApp.mm
index f6bdb50ff6b..a41ed0a0b6d 100755
--- a/examples/ios/iPhoneGuiExample/src/testApp.mm
+++ b/examples/ios/iPhoneGuiExample/src/ofApp.mm
@@ -1,11 +1,11 @@
-#include "testApp.h"
+#include "ofApp.h"
 #include "MyGuiView.h"
 
 MyGuiView * myGuiViewController;
 
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	//NOTE WE WON'T RECEIVE TOUCH EVENTS INSIDE OUR APP WHEN THERE IS A VIEW ON TOP OF THE OF VIEW
 
 	lengthRatio	= 0.5;
@@ -21,12 +21,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	float width		= ofGetWidth();
 	float height	= ofGetHeight();
@@ -57,12 +57,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 	//IF THE VIEW IS HIDDEN LETS BRING IT BACK!
 	if( myGuiViewController.view.hidden ){
@@ -71,41 +71,41 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/imageLoaderExample/src/main.mm b/examples/ios/imageLoaderExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/imageLoaderExample/src/main.mm
+++ b/examples/ios/imageLoaderExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/imageLoaderExample/src/testApp.h b/examples/ios/imageLoaderExample/src/ofApp.h
similarity index 95%
rename from examples/ios/imageLoaderExample/src/testApp.h
rename to examples/ios/imageLoaderExample/src/ofApp.h
index 1b1192c0099..8aaaf3764d7 100755
--- a/examples/ios/imageLoaderExample/src/testApp.h
+++ b/examples/ios/imageLoaderExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/imageLoaderExample/src/testApp.mm b/examples/ios/imageLoaderExample/src/ofApp.mm
similarity index 80%
rename from examples/ios/imageLoaderExample/src/testApp.mm
rename to examples/ios/imageLoaderExample/src/ofApp.mm
index a98dfdb4c06..8a782f03ed4 100755
--- a/examples/ios/imageLoaderExample/src/testApp.mm
+++ b/examples/ios/imageLoaderExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 	
 	bikers.loadImage("images/bikers.jpg");
@@ -16,12 +16,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(255,255,255);	
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){	
+void ofApp::draw(){	
 
 	ofScale(0.5, 0.5, 1.0);
 
@@ -59,52 +59,52 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/iosCustomSizeExample/src/UI/MyAppViewController.mm b/examples/ios/iosCustomSizeExample/src/UI/MyAppViewController.mm
index ab708d1e25a..2870e5a82d2 100644
--- a/examples/ios/iosCustomSizeExample/src/UI/MyAppViewController.mm
+++ b/examples/ios/iosCustomSizeExample/src/UI/MyAppViewController.mm
@@ -5,7 +5,7 @@
 
 #import "MyAppViewController.h"
 #import "ofxiOSViewController.h"
-#import "testApp.h"
+#import "ofApp.h"
 
 @implementation MyAppViewController
 
@@ -87,25 +87,25 @@ - (void)loadView {
 - (void)button1Pressed:(id)sender {
     CGSize screenSize = [[UIScreen mainScreen] bounds].size;
     CGRect appFrame = CGRectMake(0, 0, screenSize.width, screenSize.height);
-    [self launchApp:new testApp() withFrame:appFrame andTitle:@"full"];
+    [self launchApp:new ofApp() withFrame:appFrame andTitle:@"full"];
 }
 
 - (void)button2Pressed:(id)sender {
     CGSize screenSize = [[UIScreen mainScreen] bounds].size;
     CGRect appFrame = CGRectMake(screenSize.width*0.25, screenSize.height*0.25, screenSize.width*0.5, screenSize.height*0.5);
-    [self launchApp:new testApp() withFrame:appFrame andTitle:@"small"];
+    [self launchApp:new ofApp() withFrame:appFrame andTitle:@"small"];
 }
 
 - (void)button3Pressed:(id)sender {
     CGSize screenSize = [[UIScreen mainScreen] bounds].size;
     CGRect appFrame = CGRectMake(screenSize.width*0.25, 0, screenSize.width*0.5, screenSize.height);
-    [self launchApp:new testApp() withFrame:appFrame andTitle:@"tall"];
+    [self launchApp:new ofApp() withFrame:appFrame andTitle:@"tall"];
 }
 
 - (void)button4Pressed:(id)sender {
     CGSize screenSize = [[UIScreen mainScreen] bounds].size;
     CGRect appFrame = CGRectMake(0, screenSize.height*0.25, screenSize.width, screenSize.height*0.5);
-    [self launchApp:new testApp() withFrame:appFrame andTitle:@"long"];
+    [self launchApp:new ofApp() withFrame:appFrame andTitle:@"long"];
 }
 
 - (void)launchApp:(ofxiOSApp *)app 
diff --git a/examples/ios/iosCustomSizeExample/src/main.mm b/examples/ios/iosCustomSizeExample/src/main.mm
index 4903b780816..3d02d8e8079 100644
--- a/examples/ios/iosCustomSizeExample/src/main.mm
+++ b/examples/ios/iosCustomSizeExample/src/main.mm
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 
@@ -32,6 +32,6 @@ int main(){
          **/
         
         ofSetupOpenGL(1024,768, OF_FULLSCREEN);
-        ofRunApp(new testApp());
+        ofRunApp(new ofApp());
     }
 }
diff --git a/examples/ios/emptyExample/src/testApp.h b/examples/ios/iosCustomSizeExample/src/ofApp.h
similarity index 94%
rename from examples/ios/emptyExample/src/testApp.h
rename to examples/ios/iosCustomSizeExample/src/ofApp.h
index 7b2c9d61272..f6248f2b9e8 100755
--- a/examples/ios/emptyExample/src/testApp.h
+++ b/examples/ios/iosCustomSizeExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/iosCustomSizeExample/src/testApp.mm b/examples/ios/iosCustomSizeExample/src/ofApp.mm
similarity index 83%
rename from examples/ios/iosCustomSizeExample/src/testApp.mm
rename to examples/ios/iosCustomSizeExample/src/ofApp.mm
index 32a2ff1d8c9..b12dfcd9b53 100755
--- a/examples/ios/iosCustomSizeExample/src/testApp.mm
+++ b/examples/ios/iosCustomSizeExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	
     // initialize the accelerometer
 	ofxAccelerometer.setup();
@@ -10,12 +10,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     
     ofSetLineWidth(2);
     
@@ -82,52 +82,52 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     //
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
 
diff --git a/examples/ios/iosES2ShaderExample/src/main.mm b/examples/ios/iosES2ShaderExample/src/main.mm
index c25ad8e9a18..1d69daa9f8e 100644
--- a/examples/ios/iosES2ShaderExample/src/main.mm
+++ b/examples/ios/iosES2ShaderExample/src/main.mm
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofAppiOSWindow.h"
 
 int main(){
@@ -7,5 +7,5 @@ int main(){
     window->enableRendererES2();
 
 	ofSetupOpenGL(window, 1024, 768, OF_FULLSCREEN);    // setup the GL context
-	ofRunApp(new testApp());                            // run app.
+	ofRunApp(new ofApp());                            // run app.
 }
diff --git a/examples/ios/iosES2ShaderExample/src/testApp.h b/examples/ios/iosES2ShaderExample/src/ofApp.h
similarity index 95%
rename from examples/ios/iosES2ShaderExample/src/testApp.h
rename to examples/ios/iosES2ShaderExample/src/ofApp.h
index 59b309218fc..72d3a5fcefd 100644
--- a/examples/ios/iosES2ShaderExample/src/testApp.h
+++ b/examples/ios/iosES2ShaderExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/iosES2ShaderExample/src/testApp.mm b/examples/ios/iosES2ShaderExample/src/ofApp.mm
similarity index 82%
rename from examples/ios/iosES2ShaderExample/src/testApp.mm
rename to examples/ios/iosES2ShaderExample/src/ofApp.mm
index de41c3b3903..b1310e27a90 100755
--- a/examples/ios/iosES2ShaderExample/src/testApp.mm
+++ b/examples/ios/iosES2ShaderExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(40);
 	ofSetVerticalSync(false);
 	ofEnableAlphaBlending();
@@ -16,12 +16,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofPushStyle();
 	ofSetColor(245, 58, 135);
 	ofFill();
@@ -48,54 +48,54 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
     bUseShader = true;
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
     // we have to transform the coords to what the shader is expecting which is 0,0 in the center and y axis flipped.
     mousePoint.x = touch.x * 2 - ofGetWidth();
     mousePoint.y = ofGetHeight() * 0.5 - touch.y;
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
     bUseShader = false;
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
 
diff --git a/examples/ios/iosExternalDisplayExample/src/UI/AlertViewDelegate.mm b/examples/ios/iosExternalDisplayExample/src/UI/AlertViewDelegate.mm
index 5fd96f0c7b8..774b255f664 100644
--- a/examples/ios/iosExternalDisplayExample/src/UI/AlertViewDelegate.mm
+++ b/examples/ios/iosExternalDisplayExample/src/UI/AlertViewDelegate.mm
@@ -8,7 +8,7 @@
 
 #import "AlertViewDelegate.h"
 #import "ofxiOSExternalDisplay.h"
-#import "testApp.h"
+#import "ofApp.h"
 
 @implementation AlertViewDelegate
 
@@ -30,7 +30,7 @@ - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)butto
         ofxiOSExternalDisplay::displayOnExternalScreen(displayModes[i]);
     }
     
-    ((testApp *)ofGetAppPtr())->popupDismissed();
+    ((ofApp *)ofGetAppPtr())->popupDismissed();
 }
 
 @end
diff --git a/examples/ios/iosExternalDisplayExample/src/main.mm b/examples/ios/iosExternalDisplayExample/src/main.mm
index a6f3adc407e..ae405266445 100644
--- a/examples/ios/iosExternalDisplayExample/src/main.mm
+++ b/examples/ios/iosExternalDisplayExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
     ofAppiOSWindow * window = new ofAppiOSWindow();
 	ofSetupOpenGL(window, 1024, 768, OF_FULLSCREEN);
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/iosExternalDisplayExample/src/testApp.h b/examples/ios/iosExternalDisplayExample/src/ofApp.h
similarity index 94%
rename from examples/ios/iosExternalDisplayExample/src/testApp.h
rename to examples/ios/iosExternalDisplayExample/src/ofApp.h
index d275da29ea8..7a514cbc09d 100755
--- a/examples/ios/iosExternalDisplayExample/src/testApp.h
+++ b/examples/ios/iosExternalDisplayExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofxiOSExtras.h"
 #include "ofxiOSExternalDisplay.h"
 
-class testApp : public ofxiOSApp, public ofxiOSExternalDisplay {
+class ofApp : public ofxiOSApp, public ofxiOSExternalDisplay {
 	
     public:
         void setup();
diff --git a/examples/ios/iosExternalDisplayExample/src/testApp.mm b/examples/ios/iosExternalDisplayExample/src/ofApp.mm
similarity index 91%
rename from examples/ios/iosExternalDisplayExample/src/testApp.mm
rename to examples/ios/iosExternalDisplayExample/src/ofApp.mm
index 524b6e6f988..e3d6afe827f 100755
--- a/examples/ios/iosExternalDisplayExample/src/testApp.mm
+++ b/examples/ios/iosExternalDisplayExample/src/ofApp.mm
@@ -1,5 +1,5 @@
 
-#include "testApp.h"
+#include "ofApp.h"
 
 #import "MyViewController.h"
 #import "AlertViewDelegate.h"
@@ -8,7 +8,7 @@
 AlertViewDelegate * alertViewDelegate = nil;
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	
 	// initialize the accelerometer
 	ofxAccelerometer.setup();
@@ -32,12 +32,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
     ofDisableSmoothing();
     ofSetLineWidth(2);
@@ -158,12 +158,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::presentExternalDisplayPopup(){
+void ofApp::presentExternalDisplayPopup(){
     
     alertViewDelegate = [[[AlertViewDelegate alloc] init] retain];
     
@@ -188,7 +188,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::presentExternalDisplayNotFoundPopup(){
+void ofApp::presentExternalDisplayNotFoundPopup(){
     UIAlertView * alert = [[[UIAlertView alloc] initWithTitle:@"External Display" 
                                                       message:@"External Display not found.\nConnect to an external display using a VGA adapter or AirPlay."
                                                      delegate:nil 
@@ -198,7 +198,7 @@
     [alert release];
 }
 
-void testApp::presentMirroringFailedPopup(){
+void ofApp::presentMirroringFailedPopup(){
     UIAlertView * alert = [[[UIAlertView alloc] initWithTitle:@"Mirroring Failed" 
                                                       message:@"Either you are not connected to an external display or your device does not support mirroring."
                                                      delegate:nil 
@@ -209,7 +209,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::popupDismissed(){
+void ofApp::popupDismissed(){
     if(alertViewDelegate){
         [alertViewDelegate release];
         alertViewDelegate = nil;
@@ -217,7 +217,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
     
     if(buttonExternalDisplayRect.inside(touch.x, touch.y)){
         if(ofxiOSExternalDisplay::isExternalScreenConnected()){
@@ -244,58 +244,58 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
 
 //--------------------------------------------------------------
-void testApp::externalDisplayConnected(){
+void ofApp::externalDisplayConnected(){
     ofLogVerbose("external display connected.");
     presentExternalDisplayPopup();
 }
 
 //--------------------------------------------------------------
-void testApp::externalDisplayDisconnected(){
+void ofApp::externalDisplayDisconnected(){
     ofLogVerbose("external display disconnected.");
 }
 
 //--------------------------------------------------------------
-void testApp::externalDisplayChanged(){
+void ofApp::externalDisplayChanged(){
     ofLogVerbose("external display changed.");
     if(ofxiOSExternalDisplay::isDisplayingOnDeviceScreen()){
         if(viewController){
diff --git a/examples/ios/iosCustomSizeExample/src/testApp.h b/examples/ios/iosNativeExample/src/ofApp.h
similarity index 94%
rename from examples/ios/iosCustomSizeExample/src/testApp.h
rename to examples/ios/iosNativeExample/src/ofApp.h
index 7b2c9d61272..f6248f2b9e8 100755
--- a/examples/ios/iosCustomSizeExample/src/testApp.h
+++ b/examples/ios/iosNativeExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/iosNativeExample/src/testApp.mm b/examples/ios/iosNativeExample/src/ofApp.mm
similarity index 64%
rename from examples/ios/iosNativeExample/src/testApp.mm
rename to examples/ios/iosNativeExample/src/ofApp.mm
index a9c20549972..f0ba7703459 100755
--- a/examples/ios/iosNativeExample/src/testApp.mm
+++ b/examples/ios/iosNativeExample/src/ofApp.mm
@@ -1,10 +1,10 @@
-#include "testApp.h"
+#include "ofApp.h"
 
-//NOTE: in this example testApp ( this class ) is not used. 
+//NOTE: in this example ofApp ( this class ) is not used. 
 //      look inside Apps/ to see the native iOS implementation
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	
 	// initialize the accelerometer
 	ofxAccelerometer.setup();
@@ -13,62 +13,62 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
 
diff --git a/examples/ios/iosOrientationExample/src/ActionSheetDelegateForOF.h b/examples/ios/iosOrientationExample/src/ActionSheetDelegateForOF.h
index 961dc543ab8..b10592092cb 100644
--- a/examples/ios/iosOrientationExample/src/ActionSheetDelegateForOF.h
+++ b/examples/ios/iosOrientationExample/src/ActionSheetDelegateForOF.h
@@ -5,7 +5,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "testApp.h"
+#import "ofApp.h"
 
 /**
  *  this is a bit of obj-c that will help connect the OF app with the UIActionSheet.
@@ -13,9 +13,9 @@
  */
 
 @interface ActionSheetDelegateForOF : NSObject <UIActionSheetDelegate> {
-    testApp * app;
+    ofApp * app;
 }
 
-- (id)initWithApp:(testApp *)app;
+- (id)initWithApp:(ofApp *)app;
 
 @end
diff --git a/examples/ios/iosOrientationExample/src/ActionSheetDelegateForOF.mm b/examples/ios/iosOrientationExample/src/ActionSheetDelegateForOF.mm
index a58f54df867..bb0ad697d12 100644
--- a/examples/ios/iosOrientationExample/src/ActionSheetDelegateForOF.mm
+++ b/examples/ios/iosOrientationExample/src/ActionSheetDelegateForOF.mm
@@ -12,7 +12,7 @@ @implementation ActionSheetDelegateForOF {
     //
 }
 
-- (id)initWithApp:(testApp *)myApp {
+- (id)initWithApp:(ofApp *)myApp {
     self = [super init];
     if(self) {
         app = myApp;
diff --git a/examples/ios/iosOrientationExample/src/main.mm b/examples/ios/iosOrientationExample/src/main.mm
index d3aa8273c1d..a3e60de067c 100644
--- a/examples/ios/iosOrientationExample/src/main.mm
+++ b/examples/ios/iosOrientationExample/src/main.mm
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofAppiOSWindow.h"
 
 int main() {
@@ -8,5 +8,5 @@ int main() {
     window->enableOrientationAnimation();
 
 	ofSetupOpenGL(window, 1024,768, OF_FULLSCREEN);
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/iosOrientationExample/src/testApp.h b/examples/ios/iosOrientationExample/src/ofApp.h
similarity index 95%
rename from examples/ios/iosOrientationExample/src/testApp.h
rename to examples/ios/iosOrientationExample/src/ofApp.h
index 3502327ff06..357a2bbf883 100755
--- a/examples/ios/iosOrientationExample/src/testApp.h
+++ b/examples/ios/iosOrientationExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
     
 public:
     void setup();
diff --git a/examples/ios/iosOrientationExample/src/testApp.mm b/examples/ios/iosOrientationExample/src/ofApp.mm
similarity index 86%
rename from examples/ios/iosOrientationExample/src/testApp.mm
rename to examples/ios/iosOrientationExample/src/ofApp.mm
index d6e8672b0d8..ade0de77ba6 100755
--- a/examples/ios/iosOrientationExample/src/testApp.mm
+++ b/examples/ios/iosOrientationExample/src/ofApp.mm
@@ -1,9 +1,9 @@
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofAppiOSWindow.h"
 #import "ActionSheetDelegateForOF.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(70);
     
     ofSetOrientation(OF_ORIENTATION_90_LEFT);
@@ -11,12 +11,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     
     ofSetLineWidth(2);
     
@@ -110,33 +110,33 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     //
 }
 
 //--------------------------------------------------------------
-void testApp::rotateToPortrait() {
+void ofApp::rotateToPortrait() {
     ofSetOrientation(OF_ORIENTATION_DEFAULT);
 }
 
-void testApp::rotateToPortraitUpSideDown() {
+void ofApp::rotateToPortraitUpSideDown() {
     ofSetOrientation(OF_ORIENTATION_180);
 }
 
-void testApp::rotateToLandscapeLeft() {
+void ofApp::rotateToLandscapeLeft() {
     ofSetOrientation(OF_ORIENTATION_90_LEFT);
 }
 
-void testApp::rotateToLandscapeRight() {
+void ofApp::rotateToLandscapeRight() {
     ofSetOrientation(OF_ORIENTATION_90_RIGHT);
 }
 
-void testApp::toggleAutoRotation() {
+void ofApp::toggleAutoRotation() {
     bAuto = !bAuto;
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch) {
+void ofApp::touchDown(ofTouchEventArgs & touch) {
     
     NSString * autoTitle;
     if(bAuto) {
@@ -157,49 +157,49 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     if(bAuto) {
         ofSetOrientation((ofOrientation)newOrientation);
     }
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h) {
+void ofApp::windowResized(int w, int h) {
     //
 }
 
diff --git a/examples/ios/moviePlayerExample/src/VideoPlayerControlsDelegateForOF.h b/examples/ios/moviePlayerExample/src/VideoPlayerControlsDelegateForOF.h
index ea24a478be1..3be38174d61 100644
--- a/examples/ios/moviePlayerExample/src/VideoPlayerControlsDelegateForOF.h
+++ b/examples/ios/moviePlayerExample/src/VideoPlayerControlsDelegateForOF.h
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import "VideoPlayerControls.h"
-#import "testApp.h"
+#import "ofApp.h"
 
 /**
  *  this is a bit of obj-c that will help connect the OF app with the VideoPlayerControls UI.
@@ -15,10 +15,10 @@
  */
 
 @interface VideoPlayerControlsDelegateForOF : NSObject <VideoPlayerControlsDelegate> {
-    testApp * app;
+    ofApp * app;
 }
 
-- (id)initWithApp:(testApp *)app;
+- (id)initWithApp:(ofApp *)app;
 - (void)playPressed;
 - (void)pausePressed;
 - (void)scrubBegin;
diff --git a/examples/ios/moviePlayerExample/src/VideoPlayerControlsDelegateForOF.mm b/examples/ios/moviePlayerExample/src/VideoPlayerControlsDelegateForOF.mm
index ac626bbec48..0b23d81ec87 100644
--- a/examples/ios/moviePlayerExample/src/VideoPlayerControlsDelegateForOF.mm
+++ b/examples/ios/moviePlayerExample/src/VideoPlayerControlsDelegateForOF.mm
@@ -11,7 +11,7 @@ @implementation VideoPlayerControlsDelegateForOF {
     //
 }
 
-- (id)initWithApp:(testApp *)myApp {
+- (id)initWithApp:(ofApp *)myApp {
     self = [super init];
     if(self) {
         app = myApp;
diff --git a/examples/ios/moviePlayerExample/src/main.mm b/examples/ios/moviePlayerExample/src/main.mm
index d0d384123d8..42e794fe0c0 100644
--- a/examples/ios/moviePlayerExample/src/main.mm
+++ b/examples/ios/moviePlayerExample/src/main.mm
@@ -1,7 +1,7 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/moviePlayerExample/src/testApp.h b/examples/ios/moviePlayerExample/src/ofApp.h
similarity index 96%
rename from examples/ios/moviePlayerExample/src/testApp.h
rename to examples/ios/moviePlayerExample/src/ofApp.h
index dcf656c7691..19839a8b211 100755
--- a/examples/ios/moviePlayerExample/src/testApp.h
+++ b/examples/ios/moviePlayerExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
 	public:
 		
diff --git a/examples/ios/moviePlayerExample/src/testApp.mm b/examples/ios/moviePlayerExample/src/ofApp.mm
similarity index 83%
rename from examples/ios/moviePlayerExample/src/testApp.mm
rename to examples/ios/moviePlayerExample/src/ofApp.mm
index d1526e75bc9..1be8cb88e8b 100755
--- a/examples/ios/moviePlayerExample/src/testApp.mm
+++ b/examples/ios/moviePlayerExample/src/ofApp.mm
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 #import "VideoPlayerControls.h"
 #import "VideoPlayerControlsDelegateForOF.h"
@@ -10,7 +10,7 @@
 static bool bScrubbing = false;
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	ofSetFrameRate(30);
 	ofBackground(225, 225, 225);
     
@@ -29,7 +29,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     if(!video.isLoaded()) {
         return;
     }
@@ -52,7 +52,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	ofSetColor(255);
     video.getTexture()->draw(0, 0);
@@ -84,17 +84,17 @@
 }
 
 //--------------------------------------------------------------
-void testApp::playPressed() {
+void ofApp::playPressed() {
     video.setPaused(false);
     [controls setPlay:video.isPlaying()];
 }
 
-void testApp::pausePressed() {
+void ofApp::pausePressed() {
     video.setPaused(true);
     [controls setPlay:video.isPlaying()];
 }
 
-void testApp::scrubBegin() {
+void ofApp::scrubBegin() {
     bScrubbing = true;
     
     bPlayingBeforeScrub = video.isPlaying();    // save the last play state.
@@ -103,11 +103,11 @@
     [controls setPlay:video.isPlaying()];
 }
 
-void testApp::scrubToPosition(float position) {
+void ofApp::scrubToPosition(float position) {
     video.setPosition(position);
 }
 
-void testApp::scrubEnd() {
+void ofApp::scrubEnd() {
     if(bPlayingBeforeScrub) {
         video.setPaused(false);
     }
@@ -117,7 +117,7 @@
     bScrubbing = false;
 }
 
-void testApp::loadPressed() {
+void ofApp::loadPressed() {
     video.loadMovie("hands.m4v");
     video.play();
     
@@ -130,43 +130,43 @@
     [controls setLoad:YES];
 }
 
-void testApp::unloadPressed() {
+void ofApp::unloadPressed() {
     video.close();
     [controls setLoad:NO];
 }
 
-void testApp::loopOnPressed() {
+void ofApp::loopOnPressed() {
     video.setLoopState(OF_LOOP_NORMAL);
     [controls setLoop:YES];
 }
 
-void testApp::loopOffPressed() {
+void ofApp::loopOffPressed() {
     video.setLoopState(OF_LOOP_NONE);
     [controls setLoop:NO];
 }
 
-void testApp::nativeOnPressed() {
+void ofApp::nativeOnPressed() {
     [(AVFoundationVideoPlayer *)video.getAVFoundationVideoPlayer() playerView].hidden = NO;
     [controls setNative:YES];
 }
 
-void testApp::nativeOffPressed() {
+void ofApp::nativeOffPressed() {
     [(AVFoundationVideoPlayer *)video.getAVFoundationVideoPlayer() playerView].hidden = YES;
     [controls setNative:NO];
 }
 
-void testApp::muteOnPressed() {
+void ofApp::muteOnPressed() {
     video.setVolume(0.0f);
     [controls setMute:YES];
 }
 
-void testApp::muteOffPressed() {
+void ofApp::muteOffPressed() {
     video.setVolume(1.0f);
     [controls setMute:NO];
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     if(controls) {
         [controls.view removeFromSuperview];
         controls.delegate = nil;
@@ -176,47 +176,47 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/ofxGuiExample/src/main.mm b/examples/ios/ofxGuiExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/ofxGuiExample/src/main.mm
+++ b/examples/ios/ofxGuiExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/ofxGuiExample/src/testApp.h b/examples/ios/ofxGuiExample/src/ofApp.h
similarity index 96%
rename from examples/ios/ofxGuiExample/src/testApp.h
rename to examples/ios/ofxGuiExample/src/ofApp.h
index 3d3a751c571..ede9b4fd336 100644
--- a/examples/ios/ofxGuiExample/src/testApp.h
+++ b/examples/ios/ofxGuiExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofxiOSExtras.h"
 #include "ofxGui.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/ofxGuiExample/src/testApp.mm b/examples/ios/ofxGuiExample/src/ofApp.mm
similarity index 75%
rename from examples/ios/ofxGuiExample/src/testApp.mm
rename to examples/ios/ofxGuiExample/src/ofApp.mm
index 94e868eb98b..4f407ff3f94 100755
--- a/examples/ios/ofxGuiExample/src/testApp.mm
+++ b/examples/ios/ofxGuiExample/src/ofApp.mm
@@ -1,14 +1,14 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 
     //ofSetOrientation(OF_ORIENTATION_90_LEFT); 
 	ofSetVerticalSync(true);
 	
 	// we add this listener before setting up so the initial circle resolution is correct
-	circleResolution.addListener(this, &testApp::circleResolutionChanged);
-	ringButton.addListener(this,&testApp::ringButtonPressed);
+	circleResolution.addListener(this, &ofApp::circleResolutionChanged);
+	ringButton.addListener(this,&ofApp::ringButtonPressed);
 
 	// change default sizes for ofxGui so it's usable in small/high density screens
 	ofxGuiSetFont("Questrial-Regular.ttf",10,true,true);
@@ -34,22 +34,22 @@
 }
 
 //--------------------------------------------------------------
-void testApp::circleResolutionChanged(int & circleResolution){
+void ofApp::circleResolutionChanged(int & circleResolution){
 	ofSetCircleResolution(circleResolution);
 }
 
 //--------------------------------------------------------------
-void testApp::ringButtonPressed(){
+void ofApp::ringButtonPressed(){
 	ring.play();
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackgroundGradient(ofColor::white, ofColor::gray);
     
 	if( filled ){
@@ -72,52 +72,52 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
-	ringButton.removeListener(this,&testApp::ringButtonPressed);
+void ofApp::exit(){
+	ringButton.removeListener(this,&ofApp::ringButtonPressed);
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
 
diff --git a/examples/ios/opencvExample/src/main.mm b/examples/ios/opencvExample/src/main.mm
index 2d6c6ef05ab..5f02e3b8c13 100644
--- a/examples/ios/opencvExample/src/main.mm
+++ b/examples/ios/opencvExample/src/main.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofMain.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/opencvExample/src/testApp.h b/examples/ios/opencvExample/src/ofApp.h
similarity index 97%
rename from examples/ios/opencvExample/src/testApp.h
rename to examples/ios/opencvExample/src/ofApp.h
index 2e34d158c2c..da14653b59e 100755
--- a/examples/ios/opencvExample/src/testApp.h
+++ b/examples/ios/opencvExample/src/ofApp.h
@@ -12,7 +12,7 @@
 //warning video player doesn't currently work - use live video only
 //#define _USE_LIVE_VIDEO
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
 	public:
 		
diff --git a/examples/ios/opencvExample/src/testApp.mm b/examples/ios/opencvExample/src/ofApp.mm
similarity index 87%
rename from examples/ios/opencvExample/src/testApp.mm
rename to examples/ios/opencvExample/src/ofApp.mm
index fe86706e3ff..445080c22f5 100755
--- a/examples/ios/opencvExample/src/testApp.mm
+++ b/examples/ios/opencvExample/src/ofApp.mm
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	//ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 
 	capW = 320;
@@ -30,7 +30,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(100,100,100);
 
     bool bNewFrame = false;
@@ -78,7 +78,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){	
+void ofApp::draw(){	
 	
 	ofSetColor(255);
 	ofDrawBitmapString(ofToString(ofGetFrameRate()), 20, 20);
@@ -108,51 +108,51 @@
 }
     
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
         
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	bLearnBakground = true;
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
         
 }
     
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
         
 }
     
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
         
 }
     
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
         
 }
     
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
         
 }
     
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
         
 }
     
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
         
 }
     
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
         
 }
diff --git a/examples/ios/opencvFaceExample/src/main.mm b/examples/ios/opencvFaceExample/src/main.mm
index 2d6c6ef05ab..5f02e3b8c13 100644
--- a/examples/ios/opencvFaceExample/src/main.mm
+++ b/examples/ios/opencvFaceExample/src/main.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 #include "ofMain.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/opencvFaceExample/src/testApp.h b/examples/ios/opencvFaceExample/src/ofApp.h
similarity index 96%
rename from examples/ios/opencvFaceExample/src/testApp.h
rename to examples/ios/opencvFaceExample/src/ofApp.h
index 1df9ef4d058..a70f5f06777 100755
--- a/examples/ios/opencvFaceExample/src/testApp.h
+++ b/examples/ios/opencvFaceExample/src/ofApp.h
@@ -12,7 +12,7 @@
 //UNCOMMENT TO USE CAMERA. CAMERA ONLY WORKS ON DEVICE NOT SIMULATOR
 //#define USE_CAMERA
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
 	public:
 		
diff --git a/examples/ios/opencvFaceExample/src/testApp.mm b/examples/ios/opencvFaceExample/src/ofApp.mm
similarity index 83%
rename from examples/ios/opencvFaceExample/src/testApp.mm
rename to examples/ios/opencvFaceExample/src/ofApp.mm
index cd01a9873be..1e92d4d426a 100755
--- a/examples/ios/opencvFaceExample/src/testApp.mm
+++ b/examples/ios/opencvFaceExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofxiOSSetOrientation(OFXIPHONE_ORIENTATION_LANDSCAPE_LEFT);
 	
 	finder.setup("haarcascade_frontalface_default.xml");
@@ -29,7 +29,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(255,255,255);	
 	
 	#ifdef USE_CAMERA		
@@ -51,7 +51,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){	
+void ofApp::draw(){	
 	
 	ofSetColor(255);
 	
@@ -80,52 +80,52 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs& touch){
+void ofApp::touchCancelled(ofTouchEventArgs& touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/oscReceiverExample/src/main.mm b/examples/ios/oscReceiverExample/src/main.mm
index d0d384123d8..42e794fe0c0 100644
--- a/examples/ios/oscReceiverExample/src/main.mm
+++ b/examples/ios/oscReceiverExample/src/main.mm
@@ -1,7 +1,7 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/oscReceiverExample/src/testApp.h b/examples/ios/oscReceiverExample/src/ofApp.h
similarity index 95%
rename from examples/ios/oscReceiverExample/src/testApp.h
rename to examples/ios/oscReceiverExample/src/ofApp.h
index e6426a1f016..625de8b9bc0 100644
--- a/examples/ios/oscReceiverExample/src/testApp.h
+++ b/examples/ios/oscReceiverExample/src/ofApp.h
@@ -9,7 +9,7 @@
 #define PORT 12345
 #define NUM_MSG_STRINGS 20
 
-class testApp : public ofxiOSApp {
+class ofApp : public ofxiOSApp {
 
 	public:
 		void setup();
diff --git a/examples/ios/oscReceiverExample/src/testApp.mm b/examples/ios/oscReceiverExample/src/ofApp.mm
similarity index 86%
rename from examples/ios/oscReceiverExample/src/testApp.mm
rename to examples/ios/oscReceiverExample/src/ofApp.mm
index c2758937dd5..2e1073912e2 100644
--- a/examples/ios/oscReceiverExample/src/testApp.mm
+++ b/examples/ios/oscReceiverExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetOrientation(OF_ORIENTATION_90_LEFT);
 
 	// listen on the given port
@@ -17,7 +17,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//You might want to have a heatbeat ofxOscSender here
 	//sending every 60 frames or so.
 	
@@ -73,7 +73,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	string buf;
 	buf = "listening for osc messages on port " + ofToString( PORT );
 	ofDrawBitmapString( buf, 10, 20 );
@@ -89,51 +89,51 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs &touch){
+void ofApp::touchDown(ofTouchEventArgs &touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs &touch){
+void ofApp::touchMoved(ofTouchEventArgs &touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs &touch){
+void ofApp::touchUp(ofTouchEventArgs &touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs &touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs &touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
diff --git a/examples/ios/oscSenderExample/src/main.mm b/examples/ios/oscSenderExample/src/main.mm
index d0d384123d8..42e794fe0c0 100644
--- a/examples/ios/oscSenderExample/src/main.mm
+++ b/examples/ios/oscSenderExample/src/main.mm
@@ -1,7 +1,7 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/oscSenderExample/src/testApp.h b/examples/ios/oscSenderExample/src/ofApp.h
similarity index 94%
rename from examples/ios/oscSenderExample/src/testApp.h
rename to examples/ios/oscSenderExample/src/ofApp.h
index 4353ed95fe0..f500d051a47 100644
--- a/examples/ios/oscSenderExample/src/testApp.h
+++ b/examples/ios/oscSenderExample/src/ofApp.h
@@ -8,7 +8,7 @@
 #define HOST "localhost"
 #define PORT 12345
 
-class testApp : public ofxiOSApp {
+class ofApp : public ofxiOSApp {
 
 	public:
 		void setup();
diff --git a/examples/ios/oscSenderExample/src/testApp.mm b/examples/ios/oscSenderExample/src/ofApp.mm
similarity index 78%
rename from examples/ios/oscSenderExample/src/testApp.mm
rename to examples/ios/oscSenderExample/src/ofApp.mm
index 680875ec75f..d6c0b6339e8 100644
--- a/examples/ios/oscSenderExample/src/testApp.mm
+++ b/examples/ios/oscSenderExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetOrientation(OF_ORIENTATION_90_LEFT);
 
 	ofBackground( 40, 100, 40 );
@@ -11,7 +11,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//we do a heartbeat on iOS as the phone will shut down the network connection to save power
 	//this keeps the network alive as it thinks it is being used. 
 	if( ofGetFrameNum() % 120 == 0 ){
@@ -23,7 +23,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	// display instructions
 	string buf;
 	buf = "sending osc messages to" + string( HOST ) + ofToString( PORT );
@@ -32,12 +32,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	ofxOscMessage m;
 	m.setAddress( "/mouse/button" );
 	m.addStringArg( "down" );
@@ -45,7 +45,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	ofxOscMessage m;
 	m.setAddress( "/mouse/position" );
 	m.addIntArg( touch.x );
@@ -54,7 +54,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	ofxOscMessage m;
 	m.setAddress( "/mouse/button" );
 	m.addStringArg( "up" );
@@ -62,31 +62,31 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
 
 }
diff --git a/examples/ios/polygonExample/src/main.mm b/examples/ios/polygonExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/polygonExample/src/main.mm
+++ b/examples/ios/polygonExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/polygonExample/src/testApp.h b/examples/ios/polygonExample/src/ofApp.h
similarity index 96%
rename from examples/ios/polygonExample/src/testApp.h
rename to examples/ios/polygonExample/src/ofApp.h
index 6357380c953..0c6090a7177 100755
--- a/examples/ios/polygonExample/src/testApp.h
+++ b/examples/ios/polygonExample/src/ofApp.h
@@ -15,7 +15,7 @@ typedef struct{
 } draggableVertex;
 
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/polygonExample/src/testApp.mm b/examples/ios/polygonExample/src/ofApp.mm
similarity index 95%
rename from examples/ios/polygonExample/src/testApp.mm
rename to examples/ios/polygonExample/src/ofApp.mm
index 1a65a41c4ad..ef37fa3435a 100755
--- a/examples/ios/polygonExample/src/testApp.mm
+++ b/examples/ios/polygonExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 	
 	//this is to scale down the example for the iphone screen
@@ -37,12 +37,12 @@
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofScale(appIphoneScale, appIphoneScale, 1.0);
 
@@ -410,12 +410,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	if( touch.id == 0 ){
 		for (int i = 0; i < nCurveVertices; i++){
 			float diffx = touch.x/appIphoneScale - curveVertices[i].x;
@@ -431,7 +431,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	if( touch.id == 0 ){
 		for (int i = 0; i < nCurveVertices; i++){
 		if (curveVertices[i].bBeingDragged == true){
@@ -443,7 +443,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	if( touch.id == 0 ){
 		for (int i = 0; i < nCurveVertices; i++){
 			curveVertices[i].bBeingDragged = false;	
@@ -452,31 +452,31 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/soundPlayerExample/src/main.mm b/examples/ios/soundPlayerExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/soundPlayerExample/src/main.mm
+++ b/examples/ios/soundPlayerExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/soundPlayerExample/src/testApp.h b/examples/ios/soundPlayerExample/src/ofApp.h
similarity index 95%
rename from examples/ios/soundPlayerExample/src/testApp.h
rename to examples/ios/soundPlayerExample/src/ofApp.h
index 6128170a8a6..3b20b30ceb2 100755
--- a/examples/ios/soundPlayerExample/src/testApp.h
+++ b/examples/ios/soundPlayerExample/src/ofApp.h
@@ -5,7 +5,7 @@
 #include "ofxiOSExtras.h"
 #import "AVSoundPlayer.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/soundPlayerExample/src/testApp.mm b/examples/ios/soundPlayerExample/src/ofApp.mm
similarity index 90%
rename from examples/ios/soundPlayerExample/src/testApp.mm
rename to examples/ios/soundPlayerExample/src/ofApp.mm
index ac50ab14d75..624cbf60307 100755
--- a/examples/ios/soundPlayerExample/src/testApp.mm
+++ b/examples/ios/soundPlayerExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
     
     ofBackground(255);
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);
@@ -26,12 +26,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     
 	char tempStr[255];
 	
@@ -83,13 +83,13 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     [vocals release];
     vocals = nil;
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	if( touch.id != 0 ){
         return;
     }
@@ -122,7 +122,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	if( touch.id != 0 ){
         return;
     }
@@ -152,36 +152,36 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
     
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/textureExample/src/main.mm b/examples/ios/textureExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/textureExample/src/main.mm
+++ b/examples/ios/textureExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/textureExample/src/testApp.h b/examples/ios/textureExample/src/ofApp.h
similarity index 96%
rename from examples/ios/textureExample/src/testApp.h
rename to examples/ios/textureExample/src/ofApp.h
index efafd57de0e..e8a75f7f309 100755
--- a/examples/ios/textureExample/src/testApp.h
+++ b/examples/ios/textureExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/textureExample/src/testApp.mm b/examples/ios/textureExample/src/ofApp.mm
similarity index 85%
rename from examples/ios/textureExample/src/testApp.mm
rename to examples/ios/textureExample/src/ofApp.mm
index d3b3e2d1fc2..2e134993699 100755
--- a/examples/ios/textureExample/src/testApp.mm
+++ b/examples/ios/textureExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 	
 	w = 250;
@@ -50,7 +50,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	ofBackground(255,255,255);
 	
@@ -64,7 +64,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofScale(0.6, 0.6, 1.0);
 
@@ -83,17 +83,17 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 	// when the mouse moves, we change the color image:
 	float pct = (float)touch.x / (float)ofGetWidth();
@@ -111,37 +111,37 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/vboExample/src/main.mm b/examples/ios/vboExample/src/main.mm
index a0b6b4c38f3..be71c603b64 100644
--- a/examples/ios/vboExample/src/main.mm
+++ b/examples/ios/vboExample/src/main.mm
@@ -1,8 +1,8 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
 
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/vboExample/src/testApp.h b/examples/ios/vboExample/src/ofApp.h
similarity index 96%
rename from examples/ios/vboExample/src/testApp.h
rename to examples/ios/vboExample/src/ofApp.h
index 29b388d5377..975e7db1c5b 100755
--- a/examples/ios/vboExample/src/testApp.h
+++ b/examples/ios/vboExample/src/ofApp.h
@@ -8,7 +8,7 @@
 #define GRID_HEIGHT 16
 #define LENGTH		2 * 8
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
     public:
         void setup();
diff --git a/examples/ios/vboExample/src/testApp.mm b/examples/ios/vboExample/src/ofApp.mm
similarity index 85%
rename from examples/ios/vboExample/src/testApp.mm
rename to examples/ios/vboExample/src/ofApp.mm
index cc344629664..53b7520d404 100755
--- a/examples/ios/vboExample/src/testApp.mm
+++ b/examples/ios/vboExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 	
 	bPause	   = false;
@@ -43,7 +43,7 @@
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	
 	if(!bPause) {
@@ -79,7 +79,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	
 	
 	ofPushMatrix();
@@ -112,53 +112,53 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 	if(touch.id == 2) bPause = !bPause;
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 	if(touch.id == 1) {
 		zoomTarget = ofMap(touch.x, 0.0, ofGetWidth(), 100, 500);		
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
diff --git a/examples/ios/videoGrabberExample/src/main.mm b/examples/ios/videoGrabberExample/src/main.mm
index d0d384123d8..42e794fe0c0 100644
--- a/examples/ios/videoGrabberExample/src/main.mm
+++ b/examples/ios/videoGrabberExample/src/main.mm
@@ -1,7 +1,7 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 int main(){
 	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
-	ofRunApp(new testApp);
+	ofRunApp(new ofApp);
 }
diff --git a/examples/ios/videoGrabberExample/src/testApp.h b/examples/ios/videoGrabberExample/src/ofApp.h
similarity index 95%
rename from examples/ios/videoGrabberExample/src/testApp.h
rename to examples/ios/videoGrabberExample/src/ofApp.h
index 32217b8547f..f4398cecbba 100755
--- a/examples/ios/videoGrabberExample/src/testApp.h
+++ b/examples/ios/videoGrabberExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxiOS.h"
 #include "ofxiOSExtras.h"
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 	
 	public:
         void setup();
diff --git a/examples/ios/videoGrabberExample/src/testApp.mm b/examples/ios/videoGrabberExample/src/ofApp.mm
similarity index 76%
rename from examples/ios/videoGrabberExample/src/testApp.mm
rename to examples/ios/videoGrabberExample/src/ofApp.mm
index 293bcf90479..c4c6f5e81a5 100755
--- a/examples/ios/videoGrabberExample/src/testApp.mm
+++ b/examples/ios/videoGrabberExample/src/ofApp.mm
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	
+void ofApp::setup(){	
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 
 	ofSetFrameRate(30);
@@ -13,7 +13,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(255,255,255);	
 	
 	grabber.update();
@@ -31,7 +31,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){	
+void ofApp::draw(){	
 	
 	ofSetColor(255);
 	grabber.draw(0, 0);
@@ -40,52 +40,52 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/ios/xmlSettingsExample/src/main.mm b/examples/ios/xmlSettingsExample/src/main.mm
index a3e0a990037..15fe7d7cf8f 100644
--- a/examples/ios/xmlSettingsExample/src/main.mm
+++ b/examples/ios/xmlSettingsExample/src/main.mm
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/ios/xmlSettingsExample/src/testApp.h b/examples/ios/xmlSettingsExample/src/ofApp.h
similarity index 96%
rename from examples/ios/xmlSettingsExample/src/testApp.h
rename to examples/ios/xmlSettingsExample/src/ofApp.h
index 917aa41bc10..955b2c2ffe7 100644
--- a/examples/ios/xmlSettingsExample/src/testApp.h
+++ b/examples/ios/xmlSettingsExample/src/ofApp.h
@@ -9,7 +9,7 @@
 
 #define NUM_PTS 800
 
-class testApp : public ofxiOSApp{
+class ofApp : public ofxiOSApp{
 
 	public:
 
diff --git a/examples/ios/xmlSettingsExample/src/testApp.mm b/examples/ios/xmlSettingsExample/src/ofApp.mm
similarity index 93%
rename from examples/ios/xmlSettingsExample/src/testApp.mm
rename to examples/ios/xmlSettingsExample/src/ofApp.mm
index ecc145432a6..294a004d4cb 100644
--- a/examples/ios/xmlSettingsExample/src/testApp.mm
+++ b/examples/ios/xmlSettingsExample/src/ofApp.mm
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetOrientation(OF_ORIENTATION_90_RIGHT);//Set iOS to Orientation Landscape Right
 
 	ofBackground(255,255,255);
@@ -97,7 +97,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//we change the background color here based on the values
 	//affected by the mouse position
 	ofBackground((int)red,(int)green,(int)blue);
@@ -105,7 +105,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	string drawString = "How the data is stored:\n\n";
 	if(xmlStructure.size() > 0){
@@ -145,12 +145,12 @@
 }
 
 //--------------------------------------------------------------
-void testApp::exit(){
+void ofApp::exit(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::touchDown(ofTouchEventArgs & touch){
+void ofApp::touchDown(ofTouchEventArgs & touch){
 
 	if( touch.id == 0 ){
 		//we can also add tags with the same name.
@@ -168,7 +168,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchMoved(ofTouchEventArgs & touch){
+void ofApp::touchMoved(ofTouchEventArgs & touch){
 
 	if( touch.id == 0 ){
 
@@ -232,7 +232,7 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchUp(ofTouchEventArgs & touch){
+void ofApp::touchUp(ofTouchEventArgs & touch){
 	//update the colors to the XML structure when the mouse is released
 	XML.setValue("BACKGROUND:COLOR:RED", red);
 	XML.setValue("BACKGROUND:COLOR:GREEN", green);
@@ -243,32 +243,32 @@
 }
 
 //--------------------------------------------------------------
-void testApp::touchDoubleTap(ofTouchEventArgs & touch){
+void ofApp::touchDoubleTap(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::touchCancelled(ofTouchEventArgs & touch){
+void ofApp::touchCancelled(ofTouchEventArgs & touch){
 
 }
 
 //--------------------------------------------------------------
-void testApp::lostFocus(){
+void ofApp::lostFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotFocus(){
+void ofApp::gotFocus(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMemoryWarning(){
+void ofApp::gotMemoryWarning(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::deviceOrientationChanged(int newOrientation){
+void ofApp::deviceOrientationChanged(int newOrientation){
     
 }
 
diff --git a/examples/math/noise1dExample/src/main.cpp b/examples/math/noise1dExample/src/main.cpp
index 0201775a091..8bce185a62a 100755
--- a/examples/math/noise1dExample/src/main.cpp
+++ b/examples/math/noise1dExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/math/noise1dExample/src/testApp.cpp b/examples/math/noise1dExample/src/ofApp.cpp
similarity index 91%
rename from examples/math/noise1dExample/src/testApp.cpp
rename to examples/math/noise1dExample/src/ofApp.cpp
index 3ca4460997f..c5fac1ac30a 100755
--- a/examples/math/noise1dExample/src/testApp.cpp
+++ b/examples/math/noise1dExample/src/ofApp.cpp
@@ -1,9 +1,9 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	ofSetWindowTitle("Noise 1D Example");
 	ofBackground(215,215,215);
@@ -14,7 +14,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::setupSignedNoiseDemo(){
+void ofApp::setupSignedNoiseDemo(){
 	// Setup and allocate resources used in the signed noise demo.
 	
 	nSignedNoiseData = 400; // we'll store a history of 400 numbers
@@ -39,12 +39,12 @@ void testApp::setupSignedNoiseDemo(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	updateSignedNoiseDemo();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackgroundGradient( ofColor(255), ofColor(180), OF_GRADIENT_CIRCULAR);
 	renderSignedNoiseDemo();
 	renderNoisyRobotArmDemo();
@@ -53,7 +53,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::updateSignedNoiseDemo (){
+void ofApp::updateSignedNoiseDemo (){
 	
 	// Shift all of the old data forward through the array
 	for (int i=(nSignedNoiseData-1); i>0; i--){
@@ -71,7 +71,7 @@ void testApp::updateSignedNoiseDemo (){
 
 
 //--------------------------------------------------------------
-void testApp::renderNoisyRobotArmDemo(){
+void ofApp::renderNoisyRobotArmDemo(){
 	
 	float t = ofGetElapsedTimef(); 
 	float shoulderNoiseAngleDegrees = 90 + 70.0 * ofSignedNoise(t * 1.00); 
@@ -120,7 +120,7 @@ void testApp::renderNoisyRobotArmDemo(){
 
 
 //--------------------------------------------------------------
-void testApp::drawNoisyArmRect (float w, float h){
+void ofApp::drawNoisyArmRect (float w, float h){
 	// A little helper function to simplify the code above. 
 	
 	ofFill();
@@ -139,7 +139,7 @@ void testApp::drawNoisyArmRect (float w, float h){
 
 
 //--------------------------------------------------------------
-void testApp::renderSignedNoiseDemo(){
+void ofApp::renderSignedNoiseDemo(){
 	
 	// Draw the explanatory text. 
 	string signedNoiseText = "ofSignedNoise() generates values between -1 and 1.\n";
@@ -163,7 +163,7 @@ void testApp::renderSignedNoiseDemo(){
 
 
 //--------------------------------------------------------------
-void testApp::renderRadialSignedNoiseDemo (){
+void ofApp::renderRadialSignedNoiseDemo (){
 	
 	float centerX = radialNoiseDemoX; 
 	float centerY = radialNoiseDemoY; 
@@ -218,7 +218,7 @@ void testApp::renderRadialSignedNoiseDemo (){
 }
 
 //--------------------------------------------------------------
-void testApp::renderLinearSignedNoiseDemo(){
+void ofApp::renderLinearSignedNoiseDemo(){
 	
 	// Draw the stored noise history as a straightforward timeline. 
 	ofPushMatrix();
@@ -252,46 +252,46 @@ void testApp::renderLinearSignedNoiseDemo(){
 
 // In case you're wondering, the simpleSliders get their mouse info through event handlers. 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/math/noise1dExample/src/testApp.h b/examples/math/noise1dExample/src/ofApp.h
similarity index 96%
rename from examples/math/noise1dExample/src/testApp.h
rename to examples/math/noise1dExample/src/ofApp.h
index 7e57b422db3..90179909218 100755
--- a/examples/math/noise1dExample/src/testApp.h
+++ b/examples/math/noise1dExample/src/ofApp.h
@@ -4,7 +4,7 @@
 #include "ofxSimpleSlider.h"
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void	setup();
diff --git a/examples/math/noise1dOctaveExample/src/main.cpp b/examples/math/noise1dOctaveExample/src/main.cpp
index 64883ae215d..8541b81c5eb 100755
--- a/examples/math/noise1dOctaveExample/src/main.cpp
+++ b/examples/math/noise1dOctaveExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/math/noise1dOctaveExample/src/testApp.cpp b/examples/math/noise1dOctaveExample/src/ofApp.cpp
similarity index 89%
rename from examples/math/noise1dOctaveExample/src/testApp.cpp
rename to examples/math/noise1dOctaveExample/src/ofApp.cpp
index 2f5d3797db8..94a51741223 100755
--- a/examples/math/noise1dOctaveExample/src/testApp.cpp
+++ b/examples/math/noise1dOctaveExample/src/ofApp.cpp
@@ -3,10 +3,10 @@
  can be generated by summing multiple "octaves" of noise.
 */
 
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	ofSetWindowTitle("Multiband Noise Example");
 	ofSetVerticalSync(true);
@@ -15,18 +15,18 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	updateMultibandNoiseDemo();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackgroundGradient( ofColor(240), ofColor(180), OF_GRADIENT_CIRCULAR);
 	renderMultibandNoiseDemo();
 }
 
 //--------------------------------------------------------------
-void testApp::setupMultibandNoiseDemo(){
+void ofApp::setupMultibandNoiseDemo(){
 	// setup and allocate resources used in the multi-noise strip demo.
 	
 	nNoiseStrips = 8;
@@ -46,7 +46,7 @@ void testApp::setupMultibandNoiseDemo(){
 	// multiply against their respective noise channels. 
 	float noiseAmounts[8] = {0,0,0, 0.82,0.59,0.41, 0.06,0.17}; // fer example
 	
-	// I'm using a simple struct ("NoiseDataStrip", in testApp.h) to store the 
+	// I'm using a simple struct ("NoiseDataStrip", in ofApp.h) to store the 
 	// data contained by one of these noise recordings. Each struct contains
 	// the bounding coordinates (x,y,w,h), and some other parameters, plus
 	// the float array (data) containing the noise recordings. 
@@ -71,7 +71,7 @@ void testApp::setupMultibandNoiseDemo(){
 }
 
 //--------------------------------------------------------------
-void testApp::updateMultibandNoiseDemo(){
+void ofApp::updateMultibandNoiseDemo(){
 	
 	// For each noise strip
 	for (int i=0; i<nNoiseStrips; i++){
@@ -125,7 +125,7 @@ void testApp::updateMultibandNoiseDemo(){
 
 
 //--------------------------------------------------------------
-void testApp::renderMultibandNoiseDemo(){
+void ofApp::renderMultibandNoiseDemo(){
 	
 	// draw the individual strips
 	float stackBottom = 0; 
@@ -161,7 +161,7 @@ void testApp::renderMultibandNoiseDemo(){
 
 
 //--------------------------------------------------------------
-void testApp::render1DNoiseStrip (float x, float y, float width, float height, float dt, float *data){
+void ofApp::render1DNoiseStrip (float x, float y, float width, float height, float dt, float *data){
 	
 	ofPushMatrix();
 	ofDisableSmoothing();
@@ -222,46 +222,46 @@ void testApp::render1DNoiseStrip (float x, float y, float width, float height, f
 
 // In case you're wondering, the simpleSliders get their mouse info through event handlers. 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/math/noise1dOctaveExample/src/testApp.h b/examples/math/noise1dOctaveExample/src/ofApp.h
similarity index 96%
rename from examples/math/noise1dOctaveExample/src/testApp.h
rename to examples/math/noise1dOctaveExample/src/ofApp.h
index abeffd1fd14..53028f2cd6e 100755
--- a/examples/math/noise1dOctaveExample/src/testApp.h
+++ b/examples/math/noise1dOctaveExample/src/ofApp.h
@@ -14,7 +14,7 @@ struct NoiseDataStrip {
 	float noiseStep; 
 };
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void	setup();
diff --git a/examples/math/noiseField2dExample/src/main.cpp b/examples/math/noiseField2dExample/src/main.cpp
index 6a6dd0e6b7d..10d2ab212e7 100644
--- a/examples/math/noiseField2dExample/src/main.cpp
+++ b/examples/math/noiseField2dExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/math/noiseField2dExample/src/testApp.cpp b/examples/math/noiseField2dExample/src/ofApp.cpp
similarity index 89%
rename from examples/math/noiseField2dExample/src/testApp.cpp
rename to examples/math/noiseField2dExample/src/ofApp.cpp
index 4c15db985cc..e2eeca9e4a6 100644
--- a/examples/math/noiseField2dExample/src/testApp.cpp
+++ b/examples/math/noiseField2dExample/src/ofApp.cpp
@@ -6,7 +6,7 @@
  http://www.openprocessing.org/visuals/?visualID=2785
  */
 
-#include "testApp.h"
+#include "ofApp.h"
 
 /*
  All these settings control the behavior of the app. In general it's a better
@@ -30,7 +30,7 @@ bool debugMode = false;
  for the v.
  */
 //--------------------------------------------------------------
-ofVec2f testApp::getField(ofVec2f position) {
+ofVec2f ofApp::getField(ofVec2f position) {
 	float normx = ofNormalize(position.x, 0, ofGetWidth());
 	float normy = ofNormalize(position.y, 0, ofGetHeight());
 	float u = ofNoise(t + phase, normx * complexity + phase, normy * complexity + phase);
@@ -39,7 +39,7 @@ ofVec2f testApp::getField(ofVec2f position) {
 }
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	ofSetVerticalSync(true); // don't go too fast
 	ofEnableAlphaBlending();
 	
@@ -55,7 +55,7 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	width = ofGetWidth(), height = ofGetHeight();
   t = ofGetFrameNum() * timeSpeed;
   for(int i = 0; i < nPoints; i++) {
@@ -81,7 +81,7 @@ void testApp::update() {
 } 
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofBackground(255);
   if(debugMode) {
     ofSetColor(0);
@@ -111,48 +111,48 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key) {
+void ofApp::keyPressed(int key) {
 	// when you hit a key, draw the debug screen
   debugMode = !debugMode;
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key) {
+void ofApp::keyReleased(int key) {
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y) {
+void ofApp::mouseMoved(int x, int y) {
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button) {
+void ofApp::mouseDragged(int x, int y, int button) {
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button) {
+void ofApp::mousePressed(int x, int y, int button) {
 	// when you click the mouse, reset all the points
   setup();
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button) {
+void ofApp::mouseReleased(int x, int y, int button) {
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h) {
+void ofApp::windowResized(int w, int h) {
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/math/noiseField2dExample/src/testApp.h b/examples/math/noiseField2dExample/src/ofApp.h
similarity index 94%
rename from examples/math/noiseField2dExample/src/testApp.h
rename to examples/math/noiseField2dExample/src/ofApp.h
index 4e2ab434cb7..84ae464487b 100644
--- a/examples/math/noiseField2dExample/src/testApp.h
+++ b/examples/math/noiseField2dExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/math/particlesExample/src/demoParticle.cpp b/examples/math/particlesExample/src/demoParticle.cpp
index 0e4efeaab3d..df24870d562 100644
--- a/examples/math/particlesExample/src/demoParticle.cpp
+++ b/examples/math/particlesExample/src/demoParticle.cpp
@@ -136,7 +136,7 @@ void demoParticle::update(){
 	
 	
 	//3 - (optional) LIMIT THE PARTICLES TO STAY ON SCREEN 
-	//we could also pass in bounds to check - or alternatively do this at the testApp level
+	//we could also pass in bounds to check - or alternatively do this at the ofApp level
 	if( pos.x > ofGetWidth() ){
 		pos.x = ofGetWidth();
 		vel.x *= -1.0;
diff --git a/examples/math/particlesExample/src/main.cpp b/examples/math/particlesExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/math/particlesExample/src/main.cpp
+++ b/examples/math/particlesExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/math/particlesExample/src/testApp.cpp b/examples/math/particlesExample/src/ofApp.cpp
similarity index 85%
rename from examples/math/particlesExample/src/testApp.cpp
rename to examples/math/particlesExample/src/ofApp.cpp
index 31b3990dbd1..974767cdf28 100644
--- a/examples/math/particlesExample/src/testApp.cpp
+++ b/examples/math/particlesExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 	
 	int num = 1500;
@@ -14,7 +14,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::resetParticles(){
+void ofApp::resetParticles(){
 
 	//these are the attraction points used in the forth demo 
 	attractPoints.clear();
@@ -32,7 +32,7 @@ void testApp::resetParticles(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	for(unsigned int i = 0; i < p.size(); i++){
 		p[i].setMode(currentMode);
 		p[i].update();
@@ -46,7 +46,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofBackgroundGradient(ofColor(60,60,60), ofColor(10,10,10));
 
 	for(unsigned int i = 0; i < p.size(); i++){
@@ -68,7 +68,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if( key == '1'){
 		currentMode = PARTICLE_MODE_ATTRACT;
 		currentModeStr = "1 - PARTICLE_MODE_ATTRACT: attracts to mouse"; 		
@@ -93,41 +93,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/math/particlesExample/src/testApp.h b/examples/math/particlesExample/src/ofApp.h
similarity index 95%
rename from examples/math/particlesExample/src/testApp.h
rename to examples/math/particlesExample/src/ofApp.h
index d2630cd2bff..7128f23d7b9 100644
--- a/examples/math/particlesExample/src/testApp.h
+++ b/examples/math/particlesExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "demoParticle.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/math/periodicSignalsExample/src/main.cpp b/examples/math/periodicSignalsExample/src/main.cpp
index b1735078865..581f7e8ca7c 100644
--- a/examples/math/periodicSignalsExample/src/main.cpp
+++ b/examples/math/periodicSignalsExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/math/periodicSignalsExample/src/testApp.cpp b/examples/math/periodicSignalsExample/src/ofApp.cpp
similarity index 88%
rename from examples/math/periodicSignalsExample/src/testApp.cpp
rename to examples/math/periodicSignalsExample/src/ofApp.cpp
index f80c19c570f..63c9c1b609a 100644
--- a/examples/math/periodicSignalsExample/src/testApp.cpp
+++ b/examples/math/periodicSignalsExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	trail.resize(8);
 	y.resize(8);
 
@@ -30,7 +30,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	//if the speed has changed we need to clear the lines.
     // we can't test for float equality or non-equality 
@@ -71,7 +71,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofBackgroundGradient(ofColor(240),ofColor(210),OF_GRADIENT_BAR);
 
@@ -116,53 +116,53 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::speedChanged(){
+void ofApp::speedChanged(){
 	for(unsigned int i=0;i<trail.size();i++){
 		trail[i].clear();
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/math/periodicSignalsExample/src/testApp.h b/examples/math/periodicSignalsExample/src/ofApp.h
similarity index 95%
rename from examples/math/periodicSignalsExample/src/testApp.h
rename to examples/math/periodicSignalsExample/src/ofApp.h
index 643e566f355..cad1bbe34e6 100644
--- a/examples/math/periodicSignalsExample/src/testApp.h
+++ b/examples/math/periodicSignalsExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofxSimpleSlider.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/math/trigonometricMotionExample/src/main.cpp b/examples/math/trigonometricMotionExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/math/trigonometricMotionExample/src/main.cpp
+++ b/examples/math/trigonometricMotionExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/math/trigonometricMotionExample/src/testApp.cpp b/examples/math/trigonometricMotionExample/src/ofApp.cpp
similarity index 93%
rename from examples/math/trigonometricMotionExample/src/testApp.cpp
rename to examples/math/trigonometricMotionExample/src/ofApp.cpp
index 25d0e4c5164..649562cdf98 100644
--- a/examples/math/trigonometricMotionExample/src/testApp.cpp
+++ b/examples/math/trigonometricMotionExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	ofSetCircleResolution(40);
 	
@@ -36,7 +36,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	for (unsigned int i=0; i<horizontalOscilators.size(); i++) {
 		horizontalOscilators[i].update();
@@ -48,7 +48,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofBackgroundGradient(ofColor(245), ofColor(200));
 	//ofSetLineWidth(1);
 	
@@ -154,12 +154,12 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	if (key == ' ') {//when the spacebar is pressed the vectors that contain all the oscillators are cleared.
 		horizontalOscilators.clear();
 		verticalOscilators.clear();
@@ -167,12 +167,12 @@ void testApp::keyReleased(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	if (selectedOscilator>-1) {//when an oscillator is clicked and dragged it's speed (freq) and amplitude are changed.
 		//the following lines do so.
 		if(bSelectedOscHor==true){
@@ -188,7 +188,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 	if (y< TOP_MARGIN && x>LEFT_MARGIN) {
 		for (unsigned int i = 0; i < horizontalOscilators.size(); i++) {//this goes through the horizontal oscillators checking if anyone has been clicked over.
@@ -217,13 +217,13 @@ void testApp::mousePressed(int x, int y, int button){
 	}
 }
 //--------------------------------------------------------------
-void testApp::setPressedOscilator(int index, bool isHorizontal){
+void ofApp::setPressedOscilator(int index, bool isHorizontal){
 	selectedOscilator=index;
 	bSelectedOscHor =isHorizontal;
 	bSelectedOscVert =!isHorizontal;
 }
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	bScaleMouse=false;
 	selectedOscilator=-1;
 	bSelectedOscHor=false;
@@ -231,16 +231,16 @@ void testApp::mouseReleased(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/math/trigonometricMotionExample/src/testApp.h b/examples/math/trigonometricMotionExample/src/ofApp.h
similarity index 99%
rename from examples/math/trigonometricMotionExample/src/testApp.h
rename to examples/math/trigonometricMotionExample/src/ofApp.h
index 30cf843e872..2a99bf7ffe0 100644
--- a/examples/math/trigonometricMotionExample/src/testApp.h
+++ b/examples/math/trigonometricMotionExample/src/ofApp.h
@@ -71,7 +71,7 @@ class  oscillator {
 
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/math/trigonometryExample/src/main.cpp b/examples/math/trigonometryExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/math/trigonometryExample/src/main.cpp
+++ b/examples/math/trigonometryExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/math/trigonometryExample/src/testApp.cpp b/examples/math/trigonometryExample/src/ofApp.cpp
similarity index 89%
rename from examples/math/trigonometryExample/src/testApp.cpp
rename to examples/math/trigonometryExample/src/ofApp.cpp
index 551240e7699..1b92e6d1f47 100644
--- a/examples/math/trigonometryExample/src/testApp.cpp
+++ b/examples/math/trigonometryExample/src/ofApp.cpp
@@ -6,10 +6,10 @@
  * Created by Roy Macdonald on 2/24/2012
  */
 
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	ofSetFrameRate(60);
 	ofBackground(50);
@@ -34,7 +34,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	if (!ofGetMousePressed()) {//press the mouse to stop the angle from incrementing.
 		angle+=rotationSpeed;//at each update the angle get's incremented 
 	}
@@ -59,7 +59,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	//we translate everything to the center of the circle so it's easier to draw and understand.
 	ofTranslate(center);
 	
@@ -130,22 +130,22 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	ofVec2f mousePos(x-center.x, y-center.y);
 	if (mousePos.length()<radius ) {
 		angle = -mousePos.angleRad(ofVec2f(radius,0));
@@ -156,7 +156,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	ofVec2f mousePos(x-center.x, y-center.y);
 	if (mousePos.length()<radius ) {
 		angle = -mousePos.angleRad(ofVec2f(radius,0));
@@ -167,21 +167,21 @@ void testApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/math/trigonometryExample/src/testApp.h b/examples/math/trigonometryExample/src/ofApp.h
similarity index 94%
rename from examples/math/trigonometryExample/src/testApp.h
rename to examples/math/trigonometryExample/src/ofApp.h
index 7a99f5c75ff..e58e1fbfd2c 100644
--- a/examples/math/trigonometryExample/src/testApp.h
+++ b/examples/math/trigonometryExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	public:
 		void setup();
 		void update();
diff --git a/examples/math/vectorMathExample/src/main.cpp b/examples/math/vectorMathExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/math/vectorMathExample/src/main.cpp
+++ b/examples/math/vectorMathExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/math/vectorMathExample/src/testApp.cpp b/examples/math/vectorMathExample/src/ofApp.cpp
similarity index 90%
rename from examples/math/vectorMathExample/src/testApp.cpp
rename to examples/math/vectorMathExample/src/ofApp.cpp
index df7f28c66b0..a857206d7ab 100644
--- a/examples/math/vectorMathExample/src/testApp.cpp
+++ b/examples/math/vectorMathExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetVerticalSync(true);
 
 	nPts = 0;
@@ -34,7 +34,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
      // rotation occurs around 0,0,0 position.
      // since 0,0,0 is the top left corner, we need to:
@@ -86,7 +86,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
      ofSetHexColor(0x000000);
      ofNoFill();
@@ -132,7 +132,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 
     switch (key){
         case 'a':
@@ -163,15 +163,15 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased  (int key){
+void ofApp::keyReleased  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
      bDrawnAnything = true;
 
@@ -183,26 +183,26 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
      nPts = 0;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/math/vectorMathExample/src/testApp.h b/examples/math/vectorMathExample/src/ofApp.h
similarity index 95%
rename from examples/math/vectorMathExample/src/testApp.h
rename to examples/math/vectorMathExample/src/ofApp.h
index 137a94ea79a..36ce0843d7c 100644
--- a/examples/math/vectorMathExample/src/testApp.h
+++ b/examples/math/vectorMathExample/src/ofApp.h
@@ -4,7 +4,7 @@
 
 #define MAX_N_PTS         1500
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/sound/audioInputExample/src/main.cpp b/examples/sound/audioInputExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/sound/audioInputExample/src/main.cpp
+++ b/examples/sound/audioInputExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/sound/audioInputExample/src/testApp.cpp b/examples/sound/audioInputExample/src/ofApp.cpp
similarity index 88%
rename from examples/sound/audioInputExample/src/testApp.cpp
rename to examples/sound/audioInputExample/src/ofApp.cpp
index 9db30662753..ff99621276e 100644
--- a/examples/sound/audioInputExample/src/testApp.cpp
+++ b/examples/sound/audioInputExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	 
+void ofApp::setup(){	 
 	
 	ofSetVerticalSync(true);
 	ofSetCircleResolution(80);
@@ -35,7 +35,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//lets scale the vol up to a 0-1 range 
 	scaledVol = ofMap(smoothedVol, 0.0, 0.17, 0.0, 1.0, true);
 
@@ -49,7 +49,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	ofSetColor(225);
 	ofDrawBitmapString("AUDIO INPUT EXAMPLE", 32, 32);
@@ -139,7 +139,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::audioIn(float * input, int bufferSize, int nChannels){	
+void ofApp::audioIn(float * input, int bufferSize, int nChannels){	
 	
 	float curVol = 0.0;
 	
@@ -170,7 +170,7 @@ void testApp::audioIn(float * input, int bufferSize, int nChannels){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	if( key == 's' ){
 		soundStream.start();
 	}
@@ -181,42 +181,42 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
 
diff --git a/examples/sound/audioInputExample/src/testApp.h b/examples/sound/audioInputExample/src/ofApp.h
similarity index 95%
rename from examples/sound/audioInputExample/src/testApp.h
rename to examples/sound/audioInputExample/src/ofApp.h
index 104e8c6d799..7cbf086b190 100644
--- a/examples/sound/audioInputExample/src/testApp.h
+++ b/examples/sound/audioInputExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/sound/audioOutputExample/src/main.cpp b/examples/sound/audioOutputExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/sound/audioOutputExample/src/main.cpp
+++ b/examples/sound/audioOutputExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/sound/audioOutputExample/src/testApp.cpp b/examples/sound/audioOutputExample/src/ofApp.cpp
similarity index 88%
rename from examples/sound/audioOutputExample/src/testApp.cpp
rename to examples/sound/audioOutputExample/src/ofApp.cpp
index 7d6bf90c2d0..8ab6799a4d2 100644
--- a/examples/sound/audioOutputExample/src/testApp.cpp
+++ b/examples/sound/audioOutputExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	ofBackground(34, 34, 34);
 
@@ -34,12 +34,12 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetColor(225);
 	ofDrawBitmapString("AUDIO OUTPUT EXAMPLE", 32, 32);
@@ -109,7 +109,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 	if (key == '-' || key == '_' ){
 		volume -= 0.05;
 		volume = MAX(volume, 0);
@@ -129,12 +129,12 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased  (int key){
+void ofApp::keyReleased  (int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	int width = ofGetWidth();
 	pan = (float)x / (float)width;
 	float height = (float)ofGetHeight();
@@ -144,29 +144,29 @@ void testApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	int width = ofGetWidth();
 	pan = (float)x / (float)width;
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	bNoise = true;
 }
 
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	bNoise = false;
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::audioOut(float * output, int bufferSize, int nChannels){
+void ofApp::audioOut(float * output, int bufferSize, int nChannels){
 	//pan = 0.5f;
 	float leftScale = 1 - pan;
 	float rightScale = pan;
@@ -196,11 +196,11 @@ void testApp::audioOut(float * output, int bufferSize, int nChannels){
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/sound/audioOutputExample/src/testApp.h b/examples/sound/audioOutputExample/src/ofApp.h
similarity index 95%
rename from examples/sound/audioOutputExample/src/testApp.h
rename to examples/sound/audioOutputExample/src/ofApp.h
index 96098926452..702018ff8ae 100644
--- a/examples/sound/audioOutputExample/src/testApp.h
+++ b/examples/sound/audioOutputExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/sound/soundPlayerExample/src/main.cpp b/examples/sound/soundPlayerExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/sound/soundPlayerExample/src/main.cpp
+++ b/examples/sound/soundPlayerExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/sound/soundPlayerExample/src/testApp.cpp b/examples/sound/soundPlayerExample/src/ofApp.cpp
similarity index 87%
rename from examples/sound/soundPlayerExample/src/testApp.cpp
rename to examples/sound/soundPlayerExample/src/ofApp.cpp
index 6f5f4af2d0b..41de67528d0 100644
--- a/examples/sound/soundPlayerExample/src/testApp.cpp
+++ b/examples/sound/soundPlayerExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	synth.loadSound("sounds/synth.wav");
 	beats.loadSound("sounds/1085.mp3");
 	vocals.loadSound("sounds/Violet.mp3");
@@ -14,7 +14,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	ofBackground(255,255,255);
 
@@ -24,7 +24,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	// draw the background colors:
 	float widthDiv = ofGetWidth() / 3.0f;
@@ -69,21 +69,21 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	// continuously control the speed of the beat sample via drag,
 	// when in the "beat" region:
 	float widthStep = ofGetWidth() / 3.0f;
@@ -94,7 +94,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	float widthStep = ofGetWidth() / 3.0f;
 	if (x < widthStep){
 		synth.play();
@@ -111,21 +111,21 @@ void testApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/sound/soundPlayerExample/src/testApp.h b/examples/sound/soundPlayerExample/src/ofApp.h
similarity index 94%
rename from examples/sound/soundPlayerExample/src/testApp.h
rename to examples/sound/soundPlayerExample/src/ofApp.h
index 03430ebf0bb..6699aba0c19 100644
--- a/examples/sound/soundPlayerExample/src/testApp.h
+++ b/examples/sound/soundPlayerExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/sound/soundPlayerFFTExample/src/main.cpp b/examples/sound/soundPlayerFFTExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/sound/soundPlayerFFTExample/src/main.cpp
+++ b/examples/sound/soundPlayerFFTExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/sound/soundPlayerFFTExample/src/testApp.cpp b/examples/sound/soundPlayerFFTExample/src/ofApp.cpp
similarity index 87%
rename from examples/sound/soundPlayerFFTExample/src/testApp.cpp
rename to examples/sound/soundPlayerFFTExample/src/ofApp.cpp
index 807ae5333e3..80f3782bc1a 100644
--- a/examples/sound/soundPlayerFFTExample/src/testApp.cpp
+++ b/examples/sound/soundPlayerFFTExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){	 
+void ofApp::setup(){	 
 
 	// load in sounds:
 	beat.loadSound("sounds/jdee_beat.mp3");
@@ -28,7 +28,7 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	ofBackground(80,80,20);
 
@@ -88,7 +88,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	
 	ofEnableAlphaBlending();
@@ -119,21 +119,21 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	// add into vx and vy a small amount of the change in mouse:
 	vx += (x - prevx) / 20.0f;
 	vy += (y - prevy) / 20.0f;
@@ -143,28 +143,28 @@ void testApp::mouseDragged(int x, int y, int button){
 }
  
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	prevx = x;
 	prevy = y;
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
 
diff --git a/examples/sound/soundPlayerFFTExample/src/testApp.h b/examples/sound/soundPlayerFFTExample/src/ofApp.h
similarity index 95%
rename from examples/sound/soundPlayerFFTExample/src/testApp.h
rename to examples/sound/soundPlayerFFTExample/src/ofApp.h
index e96703f15f5..0f9da19735f 100644
--- a/examples/sound/soundPlayerFFTExample/src/testApp.h
+++ b/examples/sound/soundPlayerFFTExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/utils/conversionExample/src/main.cpp b/examples/utils/conversionExample/src/main.cpp
index 9d39d0e8967..3e8c0f71904 100644
--- a/examples/utils/conversionExample/src/main.cpp
+++ b/examples/utils/conversionExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/conversionExample/src/testApp.cpp b/examples/utils/conversionExample/src/ofApp.cpp
similarity index 89%
rename from examples/utils/conversionExample/src/testApp.cpp
rename to examples/utils/conversionExample/src/ofApp.cpp
index d55f0c98c9b..b14df34aa34 100644
--- a/examples/utils/conversionExample/src/testApp.cpp
+++ b/examples/utils/conversionExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
 void splitTest(string splitInput, string delimeter) {
@@ -11,7 +11,7 @@ void splitTest(string splitInput, string delimeter) {
 }
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 	string splitInput = " a,,b,c,";
 	splitTest(" a,,b, c , ", ",");
 	splitTest(" a<><>b<> c <> ", "<>");
@@ -108,57 +108,57 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 	ofBackground(0);
 	ofSetColor(255);
 	ofDrawBitmapString("See the console for output.", 10, 20);
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/utils/conversionExample/src/testApp.h b/examples/utils/conversionExample/src/ofApp.h
similarity index 92%
rename from examples/utils/conversionExample/src/testApp.h
rename to examples/utils/conversionExample/src/ofApp.h
index 692ecf5aab7..364519a7eca 100644
--- a/examples/utils/conversionExample/src/testApp.h
+++ b/examples/utils/conversionExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	public:
 		void setup();
 		void update();
diff --git a/examples/utils/dirListExample/src/main.cpp b/examples/utils/dirListExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/utils/dirListExample/src/main.cpp
+++ b/examples/utils/dirListExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/dirListExample/src/testApp.cpp b/examples/utils/dirListExample/src/ofApp.cpp
similarity index 80%
rename from examples/utils/dirListExample/src/testApp.cpp
rename to examples/utils/dirListExample/src/ofApp.cpp
index 700b0db9268..1bf85b3a697 100644
--- a/examples/utils/dirListExample/src/testApp.cpp
+++ b/examples/utils/dirListExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 	dir.listDir("images/of_logos/");
 	dir.sort(); // in linux the file system doesn't return file lists ordered in alphabetical order
@@ -21,12 +21,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	if (dir.size() > 0){
 		ofSetColor(ofColor::white);
@@ -53,7 +53,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if (dir.size() > 0){
 		currentImage++;
 		currentImage %= dir.size();
@@ -61,41 +61,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/utils/dirListExample/src/testApp.h b/examples/utils/dirListExample/src/ofApp.h
similarity index 94%
rename from examples/utils/dirListExample/src/testApp.h
rename to examples/utils/dirListExample/src/ofApp.h
index 3448332f3ae..21b02b946c0 100644
--- a/examples/utils/dirListExample/src/testApp.h
+++ b/examples/utils/dirListExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/utils/dragDropExample/src/main.cpp b/examples/utils/dragDropExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/utils/dragDropExample/src/main.cpp
+++ b/examples/utils/dragDropExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/dragDropExample/src/testApp.cpp b/examples/utils/dragDropExample/src/ofApp.cpp
similarity index 73%
rename from examples/utils/dragDropExample/src/testApp.cpp
rename to examples/utils/dragDropExample/src/ofApp.cpp
index 75cc16a7e47..a9e65d4c460 100644
--- a/examples/utils/dragDropExample/src/testApp.cpp
+++ b/examples/utils/dragDropExample/src/ofApp.cpp
@@ -1,17 +1,17 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetColor(255);
 	
 	float dx = dragPt.x;
@@ -26,47 +26,47 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo info){
+void ofApp::dragEvent(ofDragInfo info){
 	
 	if( info.files.size() > 0 ){
 		dragPt = info.position;
diff --git a/examples/utils/dragDropExample/src/testApp.h b/examples/utils/dragDropExample/src/ofApp.h
similarity index 93%
rename from examples/utils/dragDropExample/src/testApp.h
rename to examples/utils/dragDropExample/src/ofApp.h
index 9e2235ba939..f5222836e70 100644
--- a/examples/utils/dragDropExample/src/testApp.h
+++ b/examples/utils/dragDropExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/utils/fileBufferLoadingCSVExample/src/main.cpp b/examples/utils/fileBufferLoadingCSVExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/utils/fileBufferLoadingCSVExample/src/main.cpp
+++ b/examples/utils/fileBufferLoadingCSVExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/fileBufferLoadingCSVExample/src/testApp.cpp b/examples/utils/fileBufferLoadingCSVExample/src/ofApp.cpp
similarity index 83%
rename from examples/utils/fileBufferLoadingCSVExample/src/testApp.cpp
rename to examples/utils/fileBufferLoadingCSVExample/src/ofApp.cpp
index 44189af6abb..3d13ed70e32 100644
--- a/examples/utils/fileBufferLoadingCSVExample/src/testApp.cpp
+++ b/examples/utils/fileBufferLoadingCSVExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	currentIndex = 0;
 
@@ -46,14 +46,14 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//Update our MorseCodePlayer with the app
 	player.update();
 
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	ofDrawBitmapString("PRESS A KEY (A-Z, 0-9) TO PLAY MORSE CODE", 20, 20);
 	string line1 = currentSymbol.character;
@@ -64,7 +64,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 	//Create a comparable string from an int
 	string myKey;
@@ -81,42 +81,42 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo)
+void ofApp::dragEvent(ofDragInfo dragInfo)
 {
 	
 
diff --git a/examples/utils/fileBufferLoadingCSVExample/src/testApp.h b/examples/utils/fileBufferLoadingCSVExample/src/ofApp.h
similarity index 94%
rename from examples/utils/fileBufferLoadingCSVExample/src/testApp.h
rename to examples/utils/fileBufferLoadingCSVExample/src/ofApp.h
index 6bbac6b1e8b..064109761a6 100644
--- a/examples/utils/fileBufferLoadingCSVExample/src/testApp.h
+++ b/examples/utils/fileBufferLoadingCSVExample/src/ofApp.h
@@ -5,7 +5,7 @@
 
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/utils/fileOpenSaveDialogExample/src/main.cpp b/examples/utils/fileOpenSaveDialogExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/utils/fileOpenSaveDialogExample/src/main.cpp
+++ b/examples/utils/fileOpenSaveDialogExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/fileOpenSaveDialogExample/src/testApp.cpp b/examples/utils/fileOpenSaveDialogExample/src/ofApp.cpp
similarity index 87%
rename from examples/utils/fileOpenSaveDialogExample/src/testApp.cpp
rename to examples/utils/fileOpenSaveDialogExample/src/ofApp.cpp
index 0dce79d6689..bcfa13cebe8 100644
--- a/examples/utils/fileOpenSaveDialogExample/src/testApp.cpp
+++ b/examples/utils/fileOpenSaveDialogExample/src/ofApp.cpp
@@ -1,18 +1,18 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetLogLevel(OF_LOG_VERBOSE);
 	
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::draw()
+void ofApp::draw()
 {
 	ofDrawBitmapString("Press spacebar to open an image, \"s\" to save the processed output", 20, 15);
 	
@@ -28,12 +28,12 @@ void testApp::draw()
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 	
 	if (key == ' '){
 		
@@ -76,7 +76,7 @@ bool sortColorFunction (ofColor i,ofColor j) {
 }
 
 
-void testApp::processOpenFileSelection(ofFileDialogResult openFileResult){
+void ofApp::processOpenFileSelection(ofFileDialogResult openFileResult){
 	
 	ofLogVerbose("getName(): "  + openFileResult.getName());
 	ofLogVerbose("getPath(): "  + openFileResult.getPath());
@@ -142,36 +142,36 @@ void testApp::processOpenFileSelection(ofFileDialogResult openFileResult){
 	
 }
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 	
 }
diff --git a/examples/utils/fileOpenSaveDialogExample/src/testApp.h b/examples/utils/fileOpenSaveDialogExample/src/ofApp.h
similarity index 95%
rename from examples/utils/fileOpenSaveDialogExample/src/testApp.h
rename to examples/utils/fileOpenSaveDialogExample/src/ofApp.h
index 4819269a3df..f14f0ebc075 100644
--- a/examples/utils/fileOpenSaveDialogExample/src/testApp.h
+++ b/examples/utils/fileOpenSaveDialogExample/src/ofApp.h
@@ -6,7 +6,7 @@
 
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 		void setup();
diff --git a/examples/utils/loadTextFileExample/src/main.cpp b/examples/utils/loadTextFileExample/src/main.cpp
index 98687b8bc1b..97365be81d8 100644
--- a/examples/utils/loadTextFileExample/src/main.cpp
+++ b/examples/utils/loadTextFileExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/loadTextFileExample/src/testApp.cpp b/examples/utils/loadTextFileExample/src/ofApp.cpp
similarity index 86%
rename from examples/utils/loadTextFileExample/src/testApp.cpp
rename to examples/utils/loadTextFileExample/src/ofApp.cpp
index c3ab091940e..98a39150fbd 100644
--- a/examples/utils/loadTextFileExample/src/testApp.cpp
+++ b/examples/utils/loadTextFileExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
     
     ofBackgroundHex(0xff72a1);
     ofSetFrameRate(30);
@@ -38,12 +38,12 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
     
     // the total width on the line
     int strWidth = (seussLines[lineCount].length()*8) + 5;
@@ -98,46 +98,46 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
     
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
     
 }
diff --git a/examples/utils/loadTextFileExample/src/testApp.h b/examples/utils/loadTextFileExample/src/ofApp.h
similarity index 94%
rename from examples/utils/loadTextFileExample/src/testApp.h
rename to examples/utils/loadTextFileExample/src/ofApp.h
index aa4e7e20fe6..1b5c52c4770 100644
--- a/examples/utils/loadTextFileExample/src/testApp.h
+++ b/examples/utils/loadTextFileExample/src/ofApp.h
@@ -3,7 +3,7 @@
 
 
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
     
 public:
     
diff --git a/examples/utils/loggingExample/src/main.cpp b/examples/utils/loggingExample/src/main.cpp
index dfea555a48b..71062dd8b4b 100644
--- a/examples/utils/loggingExample/src/main.cpp
+++ b/examples/utils/loggingExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/loggingExample/src/testApp.cpp b/examples/utils/loggingExample/src/ofApp.cpp
similarity index 87%
rename from examples/utils/loggingExample/src/testApp.cpp
rename to examples/utils/loggingExample/src/ofApp.cpp
index 302b8fc9877..fe136d062ba 100644
--- a/examples/utils/loggingExample/src/testApp.cpp
+++ b/examples/utils/loggingExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofSetFrameRate(60);
 	ofSetVerticalSync(true);
 
@@ -26,7 +26,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	elapsedTime = ofGetElapsedTimeMillis() - startTime;
 
 	if(elapsedTime >= triggerOne){
@@ -69,7 +69,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
 	string verboseStr = "[ ]";
 	if( verboseLevel ) verboseStr = "[x]";
@@ -82,7 +82,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	if( key == 'v' ){
 		verboseLevel = !verboseLevel;
 	}
@@ -92,42 +92,42 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	// logging message triggered by event
 	ofLog(OF_LOG_WARNING, "Mouse button %i was pressed at x=%i, y=%i !", button, x, y);
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/utils/loggingExample/src/testApp.h b/examples/utils/loggingExample/src/ofApp.h
similarity index 96%
rename from examples/utils/loggingExample/src/testApp.h
rename to examples/utils/loggingExample/src/ofApp.h
index 423e82a7529..c4747856dba 100644
--- a/examples/utils/loggingExample/src/testApp.h
+++ b/examples/utils/loggingExample/src/ofApp.h
@@ -11,7 +11,7 @@
 // Please note that the different logging levels are for demonstration
 // purposes, so don't be alarmed if you see fatal errors in your console ;-)
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 
 	public:
 		void setup();
diff --git a/examples/utils/regularExpressionExample/src/main.cpp b/examples/utils/regularExpressionExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/utils/regularExpressionExample/src/main.cpp
+++ b/examples/utils/regularExpressionExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/regularExpressionExample/src/testApp.cpp b/examples/utils/regularExpressionExample/src/ofApp.cpp
similarity index 91%
rename from examples/utils/regularExpressionExample/src/testApp.cpp
rename to examples/utils/regularExpressionExample/src/ofApp.cpp
index efa64960109..ff9c4a0f2a0 100644
--- a/examples/utils/regularExpressionExample/src/testApp.cpp
+++ b/examples/utils/regularExpressionExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 // we need to include the RegularExpression
@@ -16,7 +16,7 @@ using Poco::RegularExpression;
 
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
     ofBackground(0);
     page = 0;
     searchGoogleImages();
@@ -24,7 +24,7 @@ void testApp::setup() {
 
 
 //--------------------------------------------------------------
-void testApp::searchGoogleImages() {
+void ofApp::searchGoogleImages() {
     
     // clear old imges    
     images.clear();
@@ -112,7 +112,7 @@ void testApp::searchGoogleImages() {
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     for(unsigned int i=0; i<images.size(); i++) {
         if(!images[i].bDoneLoading) {
             images[i].loadImage(images[i].url);
@@ -123,7 +123,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
     
     // draw the raw data from google
     ofSetColor(255);
@@ -158,7 +158,7 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
     
     page += 22;
     searchGoogleImages();
@@ -166,41 +166,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
     
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
     
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
     
 }
diff --git a/examples/utils/regularExpressionExample/src/testApp.h b/examples/utils/regularExpressionExample/src/ofApp.h
similarity index 95%
rename from examples/utils/regularExpressionExample/src/testApp.h
rename to examples/utils/regularExpressionExample/src/ofApp.h
index d74d3034cc3..141a86c1065 100644
--- a/examples/utils/regularExpressionExample/src/testApp.h
+++ b/examples/utils/regularExpressionExample/src/ofApp.h
@@ -9,7 +9,7 @@ class URLImage : public ofImage {
 };
 
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
     
 public:
     
diff --git a/examples/utils/sortingExample/src/main.cpp b/examples/utils/sortingExample/src/main.cpp
index e1b23fdef2a..97895f02b89 100644
--- a/examples/utils/sortingExample/src/main.cpp
+++ b/examples/utils/sortingExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/sortingExample/src/testApp.cpp b/examples/utils/sortingExample/src/ofApp.cpp
similarity index 86%
rename from examples/utils/sortingExample/src/testApp.cpp
rename to examples/utils/sortingExample/src/ofApp.cpp
index 72c803de707..248cbfa5e78 100644
--- a/examples/utils/sortingExample/src/testApp.cpp
+++ b/examples/utils/sortingExample/src/ofApp.cpp
@@ -1,28 +1,28 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 // sort on abc's
 //--------------------------------------------------------------
-bool testApp::sortOnABC(const LyricWord &a, const LyricWord &b) {
+bool ofApp::sortOnABC(const LyricWord &a, const LyricWord &b) {
     return a.word < b.word;
 }
 
 // sort on word length
 //--------------------------------------------------------------
-bool testApp::sortOnLength(const LyricWord &a, const LyricWord &b) {
+bool ofApp::sortOnLength(const LyricWord &a, const LyricWord &b) {
     return (int)a.word.size() > (int)b.word.size();
 }
 
 // sort on occurrences
 //--------------------------------------------------------------
-bool testApp::sortOnOccurrences(const LyricWord &a, const LyricWord &b) {
+bool ofApp::sortOnOccurrences(const LyricWord &a, const LyricWord &b) {
     return a.occurrences > b.occurrences;
 }
 
 
 // remove runction
 //--------------------------------------------------------------
-bool testApp::removeWordIf(LyricWord &wrd) {
+bool ofApp::removeWordIf(LyricWord &wrd) {
     
     bool bRemove = false;
     static string ignoreWords[11] = {"the", "to", "of", "a", "and", "i", "it", "if", "is", "in", "be"};
@@ -42,7 +42,7 @@ bool testApp::removeWordIf(LyricWord &wrd) {
 }
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
     
     ofTrueTypeFont::setGlobalDpi(96);
 
@@ -114,18 +114,18 @@ void testApp::setup() {
     words = tempWord;
     
     // remove word we do not want
-    ofRemove(words, testApp::removeWordIf);
+    ofRemove(words, ofApp::removeWordIf);
 
 }
 
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
 	
 }
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
 
     ofSetColor(50);
     
@@ -164,7 +164,7 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
  
     // sort raw 
     if(key == '1')     {
@@ -175,44 +175,44 @@ void testApp::keyPressed  (int key){
     // sort alphabetically
     if(key == '2') {
         sortTypeInfo = "sorting alphabetically";
-        ofSort(words, testApp::sortOnABC);
+        ofSort(words, ofApp::sortOnABC);
     }
     
     // sort by length of word
     if(key == '3')     {
         sortTypeInfo = "sorting on word length";
-        ofSort(words, testApp::sortOnLength);
+        ofSort(words, ofApp::sortOnLength);
     }
     
     // sort by length of word
     if(key == '4')     {
         sortTypeInfo = "sorting on word occurrences";
-        ofSort(words, testApp::sortOnOccurrences);
+        ofSort(words, ofApp::sortOnOccurrences);
     }
     
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased  (int key){
+void ofApp::keyReleased  (int key){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
     
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
     
 }
diff --git a/examples/utils/sortingExample/src/testApp.h b/examples/utils/sortingExample/src/ofApp.h
similarity index 96%
rename from examples/utils/sortingExample/src/testApp.h
rename to examples/utils/sortingExample/src/ofApp.h
index 0a3283c1f3b..5039695d39f 100644
--- a/examples/utils/sortingExample/src/testApp.h
+++ b/examples/utils/sortingExample/src/ofApp.h
@@ -11,7 +11,7 @@ class LyricWord {
 
 
 // ---------------------------------------------
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 	
 public:
     
diff --git a/examples/utils/systemSpeakExample/src/main.cpp b/examples/utils/systemSpeakExample/src/main.cpp
index 8114a9b39d0..00060bace84 100644
--- a/examples/utils/systemSpeakExample/src/main.cpp
+++ b/examples/utils/systemSpeakExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/systemSpeakExample/src/testApp.cpp b/examples/utils/systemSpeakExample/src/ofApp.cpp
similarity index 83%
rename from examples/utils/systemSpeakExample/src/testApp.cpp
rename to examples/utils/systemSpeakExample/src/ofApp.cpp
index 09cb361a50b..045bd7a11be 100644
--- a/examples/utils/systemSpeakExample/src/testApp.cpp
+++ b/examples/utils/systemSpeakExample/src/ofApp.cpp
@@ -1,9 +1,9 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 static string voices[24] = {"Agnes", "Albert", "Alex", "Bad News", "Bahh", "Bells", "Boing", "Bruce", "Bubbles", "Cellos", "Deranged", "Fred", "Good News", "Hysterical", "Junior", "Kathy", "Pipe Organ", "Princess", "Ralph", "Trinoids", "Vicki", "Victoria", "Whisper", "Zarvox"};
 
 //--------------------------------------------------------------
-void testApp::setup() {
+void ofApp::setup() {
 
     font.loadFont("verdana.ttf", 34);
     voice = "Cellos";
@@ -22,7 +22,7 @@ void testApp::setup() {
 }
 
 //--------------------------------------------------------------
-void testApp::threadedFunction() {
+void ofApp::threadedFunction() {
 
     while (isThreadRunning()) {
 
@@ -51,7 +51,7 @@ void testApp::threadedFunction() {
 }
 
 //--------------------------------------------------------------
-void testApp::update() {
+void ofApp::update() {
     // get a random voice
     if(bRandomVoice) {
         voice = voices[(int)ofRandom(24)];
@@ -60,7 +60,7 @@ void testApp::update() {
 
 
 //--------------------------------------------------------------
-void testApp::draw() {
+void ofApp::draw() {
     // center the word on the screen
     float x = (ofGetWidth() - font.stringWidth(words[step])) / 2;
     float y = ofGetHeight() / 2;
@@ -71,13 +71,13 @@ void testApp::draw() {
 }
 
 //--------------------------------------------------------------
-void testApp::exit() {
+void ofApp::exit() {
     // stop the thread on exit
     waitForThread(true);
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key) {
+void ofApp::keyPressed(int key) {
     if(key == 'r') {
         bRandomVoice = !bRandomVoice;
     }
@@ -88,41 +88,41 @@ void testApp::keyPressed(int key) {
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/utils/systemSpeakExample/src/testApp.h b/examples/utils/systemSpeakExample/src/ofApp.h
similarity index 92%
rename from examples/utils/systemSpeakExample/src/testApp.h
rename to examples/utils/systemSpeakExample/src/ofApp.h
index 309ab26b740..44efe81bcba 100644
--- a/examples/utils/systemSpeakExample/src/testApp.h
+++ b/examples/utils/systemSpeakExample/src/ofApp.h
@@ -2,7 +2,7 @@
 #include "ofMain.h"
 
 // ---------------------------------------------
-class testApp : public ofBaseApp, public ofThread {
+class ofApp : public ofBaseApp, public ofThread {
 	
 public:
     
diff --git a/examples/utils/threadExample/src/main.cpp b/examples/utils/threadExample/src/main.cpp
index 09d7897d588..f415cd3317d 100644
--- a/examples/utils/threadExample/src/main.cpp
+++ b/examples/utils/threadExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/threadExample/src/testApp.cpp b/examples/utils/threadExample/src/ofApp.cpp
similarity index 73%
rename from examples/utils/threadExample/src/testApp.cpp
rename to examples/utils/threadExample/src/ofApp.cpp
index 97dd84e0b23..9b3f538c02d 100644
--- a/examples/utils/threadExample/src/testApp.cpp
+++ b/examples/utils/threadExample/src/ofApp.cpp
@@ -1,21 +1,21 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 bool locked = false;
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	mainAppsCount = 0;
 	TO.start();
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	ofBackground(0,0,0);   // black because threads are EVIL ;)
 	mainAppsCount++;
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetHexColor(0xffffff);
 	TO.draw();
 
@@ -30,7 +30,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 
     if (key == 'a'){
         TO.start();
@@ -40,40 +40,40 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
\ No newline at end of file
diff --git a/examples/utils/threadExample/src/testApp.h b/examples/utils/threadExample/src/ofApp.h
similarity index 94%
rename from examples/utils/threadExample/src/testApp.h
rename to examples/utils/threadExample/src/ofApp.h
index 6d6daf9f740..e600533957a 100644
--- a/examples/utils/threadExample/src/testApp.h
+++ b/examples/utils/threadExample/src/ofApp.h
@@ -5,7 +5,7 @@
 // this h file has the definition for an object that uses the threaded addon:
 #include "threadedObject.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/utils/windowExample/src/main.cpp b/examples/utils/windowExample/src/main.cpp
index fbee1bdca27..a2cecef6cab 100644
--- a/examples/utils/windowExample/src/main.cpp
+++ b/examples/utils/windowExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/windowExample/src/testApp.cpp b/examples/utils/windowExample/src/ofApp.cpp
similarity index 87%
rename from examples/utils/windowExample/src/testApp.cpp
rename to examples/utils/windowExample/src/ofApp.cpp
index 8dfc995308f..2b24138a67e 100644
--- a/examples/utils/windowExample/src/testApp.cpp
+++ b/examples/utils/windowExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){	 
+void ofApp::setup(){	 
 	
 	int screenW = ofGetScreenWidth();
 	int screenH = ofGetScreenHeight();
@@ -27,7 +27,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 
 	// update our window title with the framerate and the position of the window
 	// [zach fix] ofSetWindowTitle(ofToString(ofGetFrameRate(), 2)+":fps - pos ("+ofToString((int)windowX)+","+ofToString((int)windowY)+")");
@@ -77,7 +77,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetupScreen();
 	
 	ofSetHexColor(0x999999);
@@ -101,7 +101,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){ 
+void ofApp::keyPressed(int key){ 
 
 	if(key == 'f'){
 	
@@ -121,41 +121,41 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/utils/windowExample/src/testApp.h b/examples/utils/windowExample/src/ofApp.h
similarity index 94%
rename from examples/utils/windowExample/src/testApp.h
rename to examples/utils/windowExample/src/ofApp.h
index 7209d8dbae6..6b0a97dbca6 100644
--- a/examples/utils/windowExample/src/testApp.h
+++ b/examples/utils/windowExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/utils/xmlExample/src/main.cpp b/examples/utils/xmlExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/utils/xmlExample/src/main.cpp
+++ b/examples/utils/xmlExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/utils/xmlExample/src/testApp.cpp b/examples/utils/xmlExample/src/ofApp.cpp
similarity index 94%
rename from examples/utils/xmlExample/src/testApp.cpp
rename to examples/utils/xmlExample/src/ofApp.cpp
index 6240b253413..1699d0b07d2 100644
--- a/examples/utils/xmlExample/src/testApp.cpp
+++ b/examples/utils/xmlExample/src/ofApp.cpp
@@ -1,8 +1,8 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
     ofDisableAntiAliasing();
 	//-----------
@@ -91,7 +91,7 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	//we change the background color here based on the values
 	//affected by the mouse position
 	ofBackground((int)red,(int)green,(int)blue);
@@ -99,7 +99,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	//---------
 	//Lets draw the stroke as a continous line
@@ -146,7 +146,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
 
     //no data gets saved unless you hit the s key
     if(key == 's')
@@ -158,17 +158,17 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 
 	//-------
 	//we change the background color based on
@@ -227,7 +227,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
     
     //lets clear everything on mouse pressed so we save just one stroke. 
     dragPts.clear();
@@ -250,7 +250,7 @@ void testApp::mousePressed(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 	//update the colors to the XML structure when the mouse is released
     XML.setTo("//DRAWING"); // set back to the root node
@@ -284,17 +284,17 @@ void testApp::mouseReleased(int x, int y, int button){
 
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
 
diff --git a/examples/utils/xmlExample/src/testApp.h b/examples/utils/xmlExample/src/ofApp.h
similarity index 97%
rename from examples/utils/xmlExample/src/testApp.h
rename to examples/utils/xmlExample/src/ofApp.h
index a65705410a7..7c85c6522d8 100644
--- a/examples/utils/xmlExample/src/testApp.h
+++ b/examples/utils/xmlExample/src/ofApp.h
@@ -22,7 +22,7 @@
  
  */
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public:
 
diff --git a/examples/video/asciiVideo/src/main.cpp b/examples/video/asciiVideo/src/main.cpp
index d50a844b8f8..b156efd6462 100644
--- a/examples/video/asciiVideo/src/main.cpp
+++ b/examples/video/asciiVideo/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/video/asciiVideo/src/testApp.cpp b/examples/video/asciiVideo/src/ofApp.cpp
similarity index 84%
rename from examples/video/asciiVideo/src/testApp.cpp
rename to examples/video/asciiVideo/src/ofApp.cpp
index ff150e5fbb1..e5727fd5560 100644
--- a/examples/video/asciiVideo/src/testApp.cpp
+++ b/examples/video/asciiVideo/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
     ofBackground(0,0,0);
 	
@@ -24,12 +24,12 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	vidGrabber.update();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	
     
     // change background video alpha value based on the mouse position
@@ -60,7 +60,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 	// in fullscreen mode, on a pc at least, the 
 	// first time video settings the come up
@@ -76,41 +76,41 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/video/asciiVideo/src/testApp.h b/examples/video/asciiVideo/src/ofApp.h
similarity index 94%
rename from examples/video/asciiVideo/src/testApp.h
rename to examples/video/asciiVideo/src/ofApp.h
index ee39a692807..9d1e8610faa 100644
--- a/examples/video/asciiVideo/src/testApp.h
+++ b/examples/video/asciiVideo/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/video/osxHighPerformanceVideoPlayerExample/src/main.cpp b/examples/video/osxHighPerformanceVideoPlayerExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/video/osxHighPerformanceVideoPlayerExample/src/main.cpp
+++ b/examples/video/osxHighPerformanceVideoPlayerExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/video/osxHighPerformanceVideoPlayerExample/src/testApp.cpp b/examples/video/osxHighPerformanceVideoPlayerExample/src/ofApp.cpp
similarity index 91%
rename from examples/video/osxHighPerformanceVideoPlayerExample/src/testApp.cpp
rename to examples/video/osxHighPerformanceVideoPlayerExample/src/ofApp.cpp
index bed69718ee9..db4bd083340 100644
--- a/examples/video/osxHighPerformanceVideoPlayerExample/src/testApp.cpp
+++ b/examples/video/osxHighPerformanceVideoPlayerExample/src/ofApp.cpp
@@ -1,4 +1,4 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 // High Performance OS X Video Playback Example
 //--------------------------------------------------------------
@@ -8,7 +8,7 @@
 // cross platform, but can be faster for HD videos .
 //--------------------------------------------------------------
 
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255, 255, 255);
 
 	frameByframe = false;
@@ -51,12 +51,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	fingerMovie.update();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetHexColor(0xFFFFFF);
 
@@ -106,7 +106,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 	switch(key){
 	 case 'f':
 		 frameByframe = !frameByframe;
@@ -128,12 +128,12 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y){
+void ofApp::mouseMoved(int x, int y){
 	if(!frameByframe){
 		int width = ofGetWidth();
 		float pct = (float)x / (float)width;
@@ -143,7 +143,7 @@ void testApp::mouseMoved(int x, int y){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	if(!frameByframe){
 		int width = ofGetWidth();
 		float pct = (float)x / (float)width;
@@ -152,7 +152,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	if(!frameByframe){
 		fingerMovie.setPaused(true);
 	}
@@ -160,23 +160,23 @@ void testApp::mousePressed(int x, int y, int button){
 
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	if(!frameByframe){
 		fingerMovie.setPaused(false);
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){
+void ofApp::dragEvent(ofDragInfo dragInfo){
 
 }
diff --git a/examples/video/osxHighPerformanceVideoPlayerExample/src/testApp.h b/examples/video/osxHighPerformanceVideoPlayerExample/src/ofApp.h
similarity index 94%
rename from examples/video/osxHighPerformanceVideoPlayerExample/src/testApp.h
rename to examples/video/osxHighPerformanceVideoPlayerExample/src/ofApp.h
index bb27836cb3e..119ccf933bc 100644
--- a/examples/video/osxHighPerformanceVideoPlayerExample/src/testApp.h
+++ b/examples/video/osxHighPerformanceVideoPlayerExample/src/ofApp.h
@@ -3,7 +3,7 @@
 #include "ofMain.h"
 #include "ofQTKitPlayer.h"
 
-class testApp : public ofBaseApp {
+class ofApp : public ofBaseApp {
 
 	public:
 
diff --git a/examples/video/osxVideoRecorderExample/src/main.cpp b/examples/video/osxVideoRecorderExample/src/main.cpp
index 4737b3c8576..015d94cf967 100644
--- a/examples/video/osxVideoRecorderExample/src/main.cpp
+++ b/examples/video/osxVideoRecorderExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/video/osxVideoRecorderExample/src/testApp.cpp b/examples/video/osxVideoRecorderExample/src/ofApp.cpp
similarity index 91%
rename from examples/video/osxVideoRecorderExample/src/testApp.cpp
rename to examples/video/osxVideoRecorderExample/src/ofApp.cpp
index 22f4d2ffba7..47097f0f6ac 100644
--- a/examples/video/osxVideoRecorderExample/src/testApp.cpp
+++ b/examples/video/osxVideoRecorderExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 
     // This example shows how to use the OS X specific
     // video grabber to record synced video and audio to disk.
@@ -30,7 +30,7 @@ void testApp::setup(){
     // vidRecorder->setUseAudio(true);
     
 	// 4. Register for events so we'll know when videos finish saving.
-	ofAddListener(vidRecorder->videoSavedEvent, this, &testApp::videoSaved);
+	ofAddListener(vidRecorder->videoSavedEvent, this, &ofApp::videoSaved);
 	
     // 4a.  If you would like to list available video codecs on your system,
     // uncomment the following code.
@@ -62,7 +62,7 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	ofBackground(60, 60, 60);
 	
@@ -74,7 +74,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
     ofRectangle previewWindow(20, 20, 640, 480);
     ofRectangle playbackWindow(20+640, 20, 640, 480);
 
@@ -170,7 +170,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed(int key){
+void ofApp::keyPressed(int key){
 
 	if(key == ' '){
         
@@ -192,7 +192,7 @@ void testApp::keyPressed(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	if(key == 'v'){
 		vidRecorder->setVideoDeviceID( (vidRecorder->getVideoDeviceID()+1) % videoDevices.size() );
     }
@@ -202,7 +202,7 @@ void testApp::keyReleased(int key){
 }
 
 //--------------------------------------------------------------
-void testApp::videoSaved(ofVideoSavedEventArgs& e){
+void ofApp::videoSaved(ofVideoSavedEventArgs& e){
 	// the ofQTKitGrabber sends a message with the file name and any errors when the video is done recording
 	if(e.error.empty()){
 	    recordedVideoPlayback.loadMovie(e.videoPath);
@@ -218,22 +218,22 @@ void testApp::videoSaved(ofVideoSavedEventArgs& e){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){}
+void ofApp::mouseMoved(int x, int y ){}
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){}
+void ofApp::mouseDragged(int x, int y, int button){}
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){}
+void ofApp::mousePressed(int x, int y, int button){}
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){}
+void ofApp::mouseReleased(int x, int y, int button){}
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){}
+void ofApp::windowResized(int w, int h){}
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){}
+void ofApp::gotMessage(ofMessage msg){}
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){}
+void ofApp::dragEvent(ofDragInfo dragInfo){}
diff --git a/examples/video/osxVideoRecorderExample/src/testApp.h b/examples/video/osxVideoRecorderExample/src/ofApp.h
similarity index 95%
rename from examples/video/osxVideoRecorderExample/src/testApp.h
rename to examples/video/osxVideoRecorderExample/src/ofApp.h
index 4a20e194a49..c46437dc66c 100644
--- a/examples/video/osxVideoRecorderExample/src/testApp.h
+++ b/examples/video/osxVideoRecorderExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/video/videoGrabberExample/src/main.cpp b/examples/video/videoGrabberExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/video/videoGrabberExample/src/main.cpp
+++ b/examples/video/videoGrabberExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/video/videoGrabberExample/src/testApp.cpp b/examples/video/videoGrabberExample/src/ofApp.cpp
similarity index 83%
rename from examples/video/videoGrabberExample/src/testApp.cpp
rename to examples/video/videoGrabberExample/src/ofApp.cpp
index df9961e7143..8a905941c16 100644
--- a/examples/video/videoGrabberExample/src/testApp.cpp
+++ b/examples/video/videoGrabberExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	
 	camWidth 		= 320;	// try to grab at this size. 
 	camHeight 		= 240;
@@ -29,7 +29,7 @@ void testApp::setup(){
 
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
 	
 	ofBackground(100,100,100);
 	
@@ -47,7 +47,7 @@ void testApp::update(){
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 	ofSetHexColor(0xffffff);
 	vidGrabber.draw(20,20);
 	videoTexture.draw(20+camWidth,20,camWidth,camHeight);
@@ -55,7 +55,7 @@ void testApp::draw(){
 
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){ 
+void ofApp::keyPressed  (int key){ 
 	
 	// in fullscreen mode, on a pc at least, the 
 	// first time video settings the come up
@@ -75,41 +75,41 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){ 
+void ofApp::keyReleased(int key){ 
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	
 }
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/video/videoGrabberExample/src/testApp.h b/examples/video/videoGrabberExample/src/ofApp.h
similarity index 94%
rename from examples/video/videoGrabberExample/src/testApp.h
rename to examples/video/videoGrabberExample/src/ofApp.h
index 3f143e4e68a..44049169cc7 100644
--- a/examples/video/videoGrabberExample/src/testApp.h
+++ b/examples/video/videoGrabberExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 	
 	public:
 		
diff --git a/examples/video/videoPlayerExample/src/main.cpp b/examples/video/videoPlayerExample/src/main.cpp
index 0201775a091..8bce185a62a 100644
--- a/examples/video/videoPlayerExample/src/main.cpp
+++ b/examples/video/videoPlayerExample/src/main.cpp
@@ -1,5 +1,5 @@
 #include "ofMain.h"
-#include "testApp.h"
+#include "ofApp.h"
 
 //========================================================================
 int main( ){
@@ -9,6 +9,6 @@ int main( ){
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN
 	// pass in width and height too:
-	ofRunApp( new testApp());
+	ofRunApp( new ofApp());
 
 }
diff --git a/examples/video/videoPlayerExample/src/testApp.cpp b/examples/video/videoPlayerExample/src/ofApp.cpp
similarity index 87%
rename from examples/video/videoPlayerExample/src/testApp.cpp
rename to examples/video/videoPlayerExample/src/ofApp.cpp
index 7d78b0cacfb..82f8204fe7f 100644
--- a/examples/video/videoPlayerExample/src/testApp.cpp
+++ b/examples/video/videoPlayerExample/src/ofApp.cpp
@@ -1,7 +1,7 @@
-#include "testApp.h"
+#include "ofApp.h"
 
 //--------------------------------------------------------------
-void testApp::setup(){
+void ofApp::setup(){
 	ofBackground(255,255,255);
 	ofSetVerticalSync(true);
 	frameByframe = false;
@@ -14,12 +14,12 @@ void testApp::setup(){
 }
 
 //--------------------------------------------------------------
-void testApp::update(){
+void ofApp::update(){
     fingerMovie.update();
 }
 
 //--------------------------------------------------------------
-void testApp::draw(){
+void ofApp::draw(){
 
 	ofSetHexColor(0xFFFFFF);
 
@@ -59,7 +59,7 @@ void testApp::draw(){
 }
 
 //--------------------------------------------------------------
-void testApp::keyPressed  (int key){
+void ofApp::keyPressed  (int key){
     switch(key){
         case 'f':
             frameByframe=!frameByframe;
@@ -78,12 +78,12 @@ void testApp::keyPressed  (int key){
 }
 
 //--------------------------------------------------------------
-void testApp::keyReleased(int key){
+void ofApp::keyReleased(int key){
 
 }
 
 //--------------------------------------------------------------
-void testApp::mouseMoved(int x, int y ){
+void ofApp::mouseMoved(int x, int y ){
 	if(!frameByframe){
         int width = ofGetWidth();
         float pct = (float)x / (float)width;
@@ -93,7 +93,7 @@ void testApp::mouseMoved(int x, int y ){
 }
 
 //--------------------------------------------------------------
-void testApp::mouseDragged(int x, int y, int button){
+void ofApp::mouseDragged(int x, int y, int button){
 	if(!frameByframe){
         int width = ofGetWidth();
         float pct = (float)x / (float)width;
@@ -102,7 +102,7 @@ void testApp::mouseDragged(int x, int y, int button){
 }
 
 //--------------------------------------------------------------
-void testApp::mousePressed(int x, int y, int button){
+void ofApp::mousePressed(int x, int y, int button){
 	if(!frameByframe){
         fingerMovie.setPaused(true);
 	}
@@ -110,23 +110,23 @@ void testApp::mousePressed(int x, int y, int button){
 
 
 //--------------------------------------------------------------
-void testApp::mouseReleased(int x, int y, int button){
+void ofApp::mouseReleased(int x, int y, int button){
 	if(!frameByframe){
         fingerMovie.setPaused(false);
 	}
 }
 
 //--------------------------------------------------------------
-void testApp::windowResized(int w, int h){
+void ofApp::windowResized(int w, int h){
 
 }
 
 //--------------------------------------------------------------
-void testApp::gotMessage(ofMessage msg){
+void ofApp::gotMessage(ofMessage msg){
 
 }
 
 //--------------------------------------------------------------
-void testApp::dragEvent(ofDragInfo dragInfo){ 
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
 
 }
diff --git a/examples/video/videoPlayerExample/src/testApp.h b/examples/video/videoPlayerExample/src/ofApp.h
similarity index 93%
rename from examples/video/videoPlayerExample/src/testApp.h
rename to examples/video/videoPlayerExample/src/ofApp.h
index d485765ae5f..c34da337d62 100644
--- a/examples/video/videoPlayerExample/src/testApp.h
+++ b/examples/video/videoPlayerExample/src/ofApp.h
@@ -2,7 +2,7 @@
 
 #include "ofMain.h"
 
-class testApp : public ofBaseApp{
+class ofApp : public ofBaseApp{
 
 	public: