Merge lp:~fginther/frame/frame-rename into lp:frame

[Francis Ginther]

Removed references to legacy project name.

Removed references to legacy project name.

Some includes were changed to build inside a 'clean' vm.

[Chase Douglas (chasedouglas)]

LGTM :).

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-07-17 14:27:23 +0000
+++ .bzrignore	2012-07-24 22:45:29 +0000
@@ -26,14 +26,14 @@
 m4/lt~obsolete.m4
 m4/pkg.m4
 stamp-*
-test/regular/check-c-compile
-test/regular/check-cxx-compile
-test/regular/check-regular
+test/check-c-compile
+test/check-cxx-compile
+test/check-frame
 test/integration/check-integration
-tools/utouch-frame-test-mtdev
-tools/utouch-frame-test-mtdev.1
-tools/utouch-frame-test-xi2
-tools/utouch-frame-test-xi2.1
-tools/utouch-frame-test-x11
-tools/utouch-frame-test-x11.1
-utouch-frame.pc
+tools/frame-test-mtdev
+tools/frame-test-mtdev.1
+tools/frame-test-xi2
+tools/frame-test-xi2.1
+tools/frame-test-x11
+tools/frame-test-x11.1
+frame.pc

=== modified file '.gitignore'
--- .gitignore	2011-02-15 14:01:51 +0000
+++ .gitignore	2012-07-24 22:45:29 +0000
@@ -78,5 +78,5 @@
 .bzrignore
 .bzr
 patches
-tools/utouch-frame-test-mtdev
-tools/utouch-frame-test-xi2
+tools/frame-test-mtdev
+tools/frame-test-xi2

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-31 02:31:54 +0000
+++ ChangeLog	2012-07-24 22:45:29 +0000
@@ -2,7 +2,7 @@
 revno: 78 [merge]
 fixes bug: https://launchpad.net/bugs/966290
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2012-03-27 17:45:08 -0700
 message:
   Merge fix for daily build FTBFS
@@ -10,14 +10,14 @@
 revno: 77 [merge]
 fixes bug: https://launchpad.net/bugs/963072
 committer: Stephen M. Webb <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Mon 2012-03-26 08:59:49 -0400
 message:
   Change licensing from GPL-3+ to LGPL-3 (lp: #963072)
 ------------------------------------------------------------
 revno: 76 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2012-03-22 09:22:54 -0700
 message:
   Merge fixes for issues found by compiling with -Weffc++
@@ -25,7 +25,7 @@
 revno: 75 [merge]
 fixes bug: https://launchpad.net/bugs/930143
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2012-03-22 07:55:56 -0700
 message:
   Merge fix for missing virtual destructors in Window class
@@ -33,7 +33,7 @@
 revno: 74
 tags: v2.2.2
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2012-03-21 16:36:37 -0700
 message:
   Release version 2.2.2
@@ -41,7 +41,7 @@
 revno: 73 [merge]
 fixes bug: https://launchpad.net/bugs/961596
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2012-03-21 16:20:10 -0700
 message:
   Merge fix for symbol visibility for C11 _Generic property getters
@@ -49,35 +49,35 @@
 revno: 72 [merge]
 fixes bug: https://launchpad.net/bugs/961489
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2012-03-21 11:40:48 -0700
 message:
   Merge fixes for xorg-gtest usage, symbol visibility, and automake flags
 ------------------------------------------------------------
 revno: 71
 committer: Jussi Pakkanen <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2012-03-06 10:16:11 +0200
 message:
   Changed underscores to hyphens for great justice.
 ------------------------------------------------------------
 revno: 70 [merge]
 committer: Jussi Pakkanen <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Mon 2012-03-05 17:28:34 +0200
 message:
   Merged build tests.
 ------------------------------------------------------------
 revno: 69 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2012-03-01 09:58:21 -0800
 message:
   Merge miscellaneous automake cleanups
 ------------------------------------------------------------
 revno: 68 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2012-02-29 21:10:54 -0800
 message:
   Merge XInput autotools cleanup
@@ -85,35 +85,35 @@
 revno: 67
 tags: v2.2.1
 committer: Stephen M. Webb <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2012-02-15 09:32:01 -0500
 message:
   Release version 2.2.1
 ------------------------------------------------------------
 revno: 66
 committer: Stephen M. Webb <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2012-02-15 09:21:07 -0500
 message:
   Fixed 'make distcheck' failure.
 ------------------------------------------------------------
 revno: 65 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Mon 2012-02-13 13:52:32 -0800
 message:
   Merge ownership event time value type fix
 ------------------------------------------------------------
 revno: 64 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Mon 2012-02-13 09:46:53 -0800
 message:
   Merge XI version query fix
 ------------------------------------------------------------
 revno: 63 [merge]
 committer: Jussi Pakkanen <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2012-02-01 16:28:17 +0200
 message:
   Merged pkg-config fix.
@@ -121,28 +121,28 @@
 revno: 62
 tags: v2.2.0
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Mon 2012-01-30 14:32:14 -0800
 message:
   Release version 2.2.0
 ------------------------------------------------------------
 revno: 61 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Mon 2012-01-30 14:31:33 -0800
 message:
   Merge window resolution properties
 ------------------------------------------------------------
 revno: 60 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Mon 2012-01-30 11:13:30 -0800
 message:
   Merge recording fix branch
 ------------------------------------------------------------
 revno: 59 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2012-01-19 13:07:46 -0800
 message:
   Merge fix for indirect touch device axis mapping
@@ -150,35 +150,35 @@
 revno: 58
 tags: v2.1.0
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2012-01-17 21:35:01 +0100
 message:
   Release version 2.1.0
 ------------------------------------------------------------
 revno: 57
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2012-01-17 21:34:08 +0100
 message:
   Bump libtool version for additional C11 _Generic ABI
 ------------------------------------------------------------
 revno: 56
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2012-01-17 21:22:16 +0100
 message:
   Bump XInput dependencies
 ------------------------------------------------------------
 revno: 55 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2012-01-17 21:20:41 +0100
 message:
   Merge upstream XInput multitouch support
 ------------------------------------------------------------
 revno: 54 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2012-01-12 03:22:47 -0800
 message:
   Merge C11 _Generic support
@@ -186,56 +186,56 @@
 revno: 53
 tags: v2.0.0
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 16:49:57 -0800
 message:
   Release version 2.0.0
 ------------------------------------------------------------
 revno: 52
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 16:49:45 -0800
 message:
   Silently generate manpages
 ------------------------------------------------------------
 revno: 51
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 16:45:55 -0800
 message:
   Ship Doxyfile
 ------------------------------------------------------------
 revno: 50
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 16:36:21 -0800
 message:
   Ship test recordings
 ------------------------------------------------------------
 revno: 49
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 16:35:40 -0800
 message:
   Actually throw the instantiated exceptions on testing::Device errors
 ------------------------------------------------------------
 revno: 48
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 16:35:06 -0800
 message:
   Ship v2/property.h and v2/typedefs.h
 ------------------------------------------------------------
 revno: 47
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 16:34:36 -0800
 message:
   Only check for sudo if gcov support is enabled
 ------------------------------------------------------------
 revno: 46
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 13:04:51 -0800
 message:
   Remove erroneously left mem pool header files from src/Makefile.am
@@ -244,24 +244,24 @@
 ------------------------------------------------------------
 revno: 45 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-12-08 12:53:48 -0800
 message:
-  Merge utouch-frame version 2
+  Merge frame version 2
   
   Version 1 will be removed once its dependencies have been moved to
   version 2.
 ------------------------------------------------------------
 revno: 44
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2011-08-31 09:24:35 -0700
 message:
   Really fix the library version script
 ------------------------------------------------------------
 revno: 43
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2011-08-31 09:19:52 -0700
 message:
   Fix library version script bug in last merge
@@ -269,7 +269,7 @@
 revno: 42 [merge]
 author: Timo Kluck
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2011-08-31 09:10:43 -0700
 message:
   Merge coordinate transformation api extension
@@ -279,14 +279,14 @@
 revno: 41
 tags: v1.1.4
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2011-08-09 14:29:54 -0700
 message:
   Release version 1.1.4
 ------------------------------------------------------------
 revno: 40 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2011-08-09 13:13:14 -0700
 message:
   Merge resolution fix and unused variable removal
@@ -294,21 +294,21 @@
 revno: 39
 tags: v1.1.3
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-07-07 17:14:01 -0700
 message:
   Release version 1.1.3
 ------------------------------------------------------------
 revno: 38
 committer: Stephen M. Webb <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2011-06-14 09:27:45 -0400
 message:
   Added missing symbols for unit testing with XI2.
 ------------------------------------------------------------
 revno: 37 [merge]
 committer: Stephen M. Webb <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2011-06-14 08:54:06 -0400
 message:
   Added ELF symbol versioning.
@@ -316,52 +316,52 @@
 revno: 36 [merge]
 author: Henrik Rydberg <[e-mail]>
 committer: Stephen M. Webb <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2011-06-14 08:53:08 -0400
 message:
   Another swap problem fixed.
 ------------------------------------------------------------
 revno: 35 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2011-05-18 14:16:05 -0400
 message:
   Merge fix for XI 2.1 touch state processing
 ------------------------------------------------------------
 revno: 34 [merge]
 committer: Jussi Pakkanen <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2011-05-18 09:12:48 +0300
 message:
   Merged underscore removal.
 ------------------------------------------------------------
 revno: 33 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Fri 2011-04-29 09:19:10 -0400
 message:
   Merge pbuilder fix
 ------------------------------------------------------------
 revno: 32 [merge]
 committer: Jussi Pakkanen <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Fri 2011-04-29 14:43:57 +0300
 message:
   Merged clang cleanup.
 ------------------------------------------------------------
 revno: 31 [merge]
 committer: Chase Douglas <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2011-04-27 09:00:42 -0400
 message:
-  Merge semi-mt support into utouch-frame
+  Merge semi-mt support into frame
   
   This enables 3+ touch support on semi-multitouch trackpads like Synaptics
   clickpads.
 ------------------------------------------------------------
 revno: 30 [merge]
 committer: Jussi Pakkanen <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Wed 2011-04-27 15:17:40 +0300
 message:
   Merge pkg-config flag fix.
@@ -381,7 +381,7 @@
 branch nick: trunk
 timestamp: Tue 2011-03-15 20:15:17 +0100
 message:
-  Allow replay of device data through utouch-frame
+  Allow replay of device data through frame
   
   This patch adds replay capabilities to test-mtdev.
   If the specified device points to a valid evemu file,
@@ -394,7 +394,7 @@
 ------------------------------------------------------------
 revno: 27 [merge]
 committer: Stephen M. Webb <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Tue 2011-03-15 15:04:33 -0400
 message:
   Added a dependency check on xorg-server-dev when building with xi2 support.
@@ -558,13 +558,13 @@
 message:
   Optional XI2.1 support
   
-  This patchs adds optional XI2.1 support to utouch-frame. The
-  utouch/frame-xi2.h header contains helper functions equivalent
-  to utouch/frame-mtdev.h. In addition, the device-to-screen mapping
+  This patchs adds optional XI2.1 support to frame. The
+  oif/frame-xi2.h header contains helper functions equivalent
+  to oif/frame-mtdev.h In addition, the device-to-screen mapping
   is handled via XEvents and optionally XIPropertyEvent. The latter
   allows free device placement via xinput set-prop, useful in multi-
   head setups, thanks to Chase Douglas. Touch frame events can be tested
-  using the utouch-frame-test-xi2 tool. Use --with-xi to enable.
+  using the frame-test-xi2 tool. Use --with-xi to enable.
 ------------------------------------------------------------
 revno: 8
 committer: Henrik Rydberg <[e-mail]>
@@ -592,7 +592,7 @@
   onto an area on the screen, needed in particular for multihead setups.
   Moreover, the XI2.1 backend works with screen coordinates, creating
   an unnecessary discrepancy between backends. This patch adds the basic
-  transformation layer to the utouch surface, thus serving as the master
+  transformation layer to the oif surface, thus serving as the master
   point of device-to-surface mapping.
 ------------------------------------------------------------
 revno: 5
@@ -607,10 +607,10 @@
 branch nick: trunk
 timestamp: Tue 2011-02-08 19:28:09 +0100
 message:
-  Display device properties based on utouch surface instead
+  Display device properties based on oif surface instead
   
   The current code erroneously extracts the device properties from
-  the evemu device, when there is a utouch surface structure to read
+  the evemu device, when there is a oif surface structure to read
   from. Remedied.
 ------------------------------------------------------------
 revno: 3
@@ -622,7 +622,7 @@
 ------------------------------------------------------------
 revno: 2 [merge]
 committer: Stephen M. Webb <[e-mail]>
-branch nick: utouch-frame
+branch nick: frame
 timestamp: Thu 2011-02-03 13:39:08 -0500
 message:
   Changes required for uploading into Ubuntu.
@@ -633,7 +633,7 @@
 branch nick: trunk
 timestamp: Thu 2010-12-30 20:23:24 +0100
 message:
-  Initial load of utouch-frame
+  Initial load of frame
   
   Compiles and runs on mtdev. ABI proof.
 ------------------------------------------------------------

=== modified file 'INSTALL'
--- INSTALL	2010-12-30 19:23:24 +0000
+++ INSTALL	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
-utouch-frame - Touch Frame Library
+frame - Touch Frame Library
 
-To build, you need to have the autoconf, libtool, libutouch-evemu-dev
+To build, you need to have the autoconf, libtool, libevemu-dev
 and mtdev-dev packages installed. Then, do
 
    ./autogen.sh
@@ -9,16 +9,16 @@
 
 To test the touch properties of an MT device at /dev/input/eventX, do
 
-   sudo ./test/utouch-frame-test /dev/input/eventX
+   sudo ./test/frame-test /dev/input/eventX
 
 You should be able to see touch events in the terminal. After five
 seconds of inactivity, the program exits.
 
-To install utouch-frame, do
+To install frame, do
 
    sudo make install
 
-By default, utouch-frame installs to /usr/local. To change, use the --prefix
+By default, frame installs to /usr/local. To change, use the --prefix
 configure option.
 
 Enjoy,

=== modified file 'Makefile.am'
--- Makefile.am	2012-07-17 13:55:33 +0000
+++ Makefile.am	2012-07-24 22:45:29 +0000
@@ -7,7 +7,7 @@
 
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = utouch-frame.pc
+pkgconfig_DATA = frame.pc
 
 if HAVE_GCOV
   .PHONY: clean-gcda

=== modified file 'README'
--- README	2010-12-30 19:23:24 +0000
+++ README	2012-07-24 22:45:29 +0000
@@ -1,4 +1,4 @@
-utouch-frame - Touch Frame Library
+frame - Touch Frame Library
 
 This tree handles the buildup and synchronization of a set of
 simultaneous touches. The library is input agnostic.

=== modified file 'configure.ac'
--- configure.ac	2012-07-17 13:57:32 +0000
+++ configure.ac	2012-07-24 22:45:29 +0000
@@ -3,7 +3,7 @@
 AC_INIT([Touch Frame Library],
         [2.2.3],
         [],
-        [utouch-frame])
+        [frame])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([config-aux])
@@ -25,7 +25,7 @@
 AC_PROG_CXX
 AC_PROG_INSTALL
 
-PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5], [have_evemu=yes])
+PKG_CHECK_MODULES([EVEMU], [evemu >= 1.0.5], [have_evemu=yes])
 AM_CONDITIONAL([HAVE_EVEMU], [test "x$have_evemu" = xyes])
 
 PKG_CHECK_MODULES(XINPUT, x11 xext xorg-server [xi >= 1.5.99.1] [inputproto >= 2.1.99.6])
@@ -75,7 +75,7 @@
                  test/regular/Makefile
                  test/x11_mocks/Makefile
                  tools/Makefile
-                 utouch-frame.pc])
+                 frame.pc])
 
 AC_LANG_PUSH(C++)
 AC_CHECK_DECL(__clang__, CXX_LIBS="-lstdc++")

=== modified file 'doc/Doxyfile'
--- doc/Doxyfile	2011-08-27 01:29:53 +0000
+++ doc/Doxyfile	2012-07-24 22:45:29 +0000
@@ -25,7 +25,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = uTouch-Frame
+PROJECT_NAME           = Frame
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
@@ -619,7 +619,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../include/utouch
+INPUT                  = ../include/oif
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 

=== renamed file 'utouch-frame.pc.in' => 'frame.pc.in'
--- utouch-frame.pc.in	2011-04-27 09:14:30 +0000
+++ frame.pc.in	2012-07-24 22:45:29 +0000
@@ -3,8 +3,8 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: utouch-frame
+Name: frame
 Description: Touch Frame Library
 Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
-Libs: -L${libdir} -lutouch-frame
+Libs: -L${libdir} -lframe

=== renamed directory 'include/utouch' => 'include/oif'
=== modified file 'include/oif/frame.h'
--- include/utouch/frame.h	2012-06-18 18:28:21 +0000
+++ include/oif/frame.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2012 Canonical Ltd.
  *
@@ -19,12 +19,12 @@
  ****************************************************************************/
 
 /**
- * @file utouch/frame.h
+ * @file oif/frame.h
  * Definitions of the main and platform-generic API
  */
 
-#ifndef UTOUCH_FRAME_UTOUCH_FRAME_H_
-#define UTOUCH_FRAME_UTOUCH_FRAME_H_
+#ifndef FRAME_OIF_FRAME_H_
+#define FRAME_OIF_FRAME_H_
 
 /* Macros that set symbol visibilities in shared libraries properly.
  * Adapted from http://gcc.gnu.org/wiki/Visibility
@@ -58,7 +58,7 @@
 
 #include <stdint.h>
 
-/** An object for the context of the uTouch Frame instance */
+/** An object for the context of the frame instance */
 typedef struct UFHandle_* UFHandle;
 /** An object for an event */
 typedef struct UFEvent_* UFEvent;
@@ -98,8 +98,8 @@
    *
    * Value type: const char *
    *
-   * The uTouch frame library owns the string. The string is valid until an
-   * event notifying removal of the device is released.
+   * The frame library owns the string. The string is valid until an event
+   * notifying removal of the device is released.
    */
   UFDevicePropertyName = 0,
   /**
@@ -216,8 +216,8 @@
    *
    * This property holds the time the event occurred in display server
    * timespace. The time is provided in milliseconds (ms). If the event, such as
-   * device addition, occurred before the uTouch Frame context was created, the
-   * value will be 0.
+   * device addition, occurred before the frame context was created, the value
+   * will be 0.
    */
   UFEventPropertyTime,
 } UFEventProperty;
@@ -343,9 +343,9 @@
 } UFTouchProperty;
 
 /**
- * Get the event file descriptor for the uTouch Frame context
+ * Get the event file descriptor for the frame context
  *
- * @param [in] handle The uTouch Frame context object
+ * @param [in] handle The frame context object
  * @return A file descriptor for the context
  *
  * When events are available for processing, the file descriptor will be
@@ -356,7 +356,7 @@
 int frame_get_fd(UFHandle handle);
 
 /**
- * Get an event from the uTouch Frame context
+ * Get an event from the frame context
  *
  * @param [in] handle The context object
  * @param [out] event The retrieved event
@@ -738,7 +738,7 @@
 
 /** @} */
 
-#include <utouch/frame_internal.h>
+#include "frame_internal.h"
 
 #ifdef __cplusplus
 }
@@ -746,4 +746,4 @@
 
 #undef HAS_C_GENERIC_SELECTIONS
 
-#endif // UTOUCH_FRAME_UTOUCH_FRAME_H_
+#endif // FRAME_OIF_FRAME_H_

=== modified file 'include/oif/frame_internal.h'
--- include/utouch/frame_internal.h	2012-03-25 22:07:41 +0000
+++ include/oif/frame_internal.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2012 Canonical Ltd.
  *
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_
-#define UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_
+#ifndef FRAME_OIF_FRAME_INTERNAL_H_
+#define FRAME_OIF_FRAME_INTERNAL_H_
 
 #ifdef HAS_C_GENERIC_SELECTIONS
 
@@ -117,4 +117,4 @@
 
 #endif // HAS_C_GENERIC_SELECTIONS
 
-#endif // UTOUCH_FRAME_UTOUCH_FRAME_INTERNAL_H_
+#endif // FRAME_OIF_FRAME_INTERNAL_H_

=== modified file 'include/oif/frame_x11.h'
--- include/utouch/frame_x11.h	2012-06-18 18:28:21 +0000
+++ include/oif/frame_x11.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2012 Canonical Ltd.
  *
@@ -18,10 +18,10 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_XI2_H
-#define UTOUCH_FRAME_XI2_H
+#ifndef FRAME_OIF_FRAME_X11_H_
+#define FRAME_OIF_FRAME_X11_H_
 
-#include <utouch/frame.h>
+#include "frame.h"
 #include <X11/Xlib.h>
 
 #ifdef __cplusplus
@@ -34,31 +34,31 @@
  */
 
 /**
- * Create a new uTouch Frame context for an X11 window server
+ * Create a new frame context for an X11 window server
  *
  * @param [in] display The X11 server connection
- * @param [out] handle The object for the new uTouch Frame instance
+ * @param [out] handle The object for the new frame instance
  * @return UFStatusSuccess, UFStatusErrorResources, or UFStatusErrorGeneric
  */
 FRAME_PUBLIC
 UFStatus frame_x11_new(Display *display, UFHandle *handle);
 
 /**
- * Delete an X11 uTouch Frame instance
+ * Delete an X11 frame instance
  *
- * @param [in] handle The object for the uTouch Frame instance
+ * @param [in] handle The object for the frame instance
  */
 FRAME_PUBLIC
 void frame_x11_delete(UFHandle handle);
 
 /**
- * Process an X11 input event into the uTouch Frame instance
+ * Process an X11 input event into the frame instance
  *
- * @param [in] handle The uTouch Frame context
+ * @param [in] handle The frame context
  * @param [in] event The X11 generic input event cookie
  * @return UFStatusSuccess or UFStatusErrorGeneric
  *
- * The uTouch-Frame library can process XIDeviceEvent and
+ * The frame library can process XIDeviceEvent and
  * XIHierarchyEvent events. Processing these events requires additional event
  * data. This data is obtained by calling XGetEventData on the XEvent. See the
  * XGetEventData and XFreeEventData man pages for more details.
@@ -93,37 +93,37 @@
                                 UFTouchId touch_id);
 
 /**
- * Get the X11 Window ID of a uTouch Frame window
+ * Get the X11 Window ID of a frame window
  *
- * @param [in] window_id The uTouch Frame window ID object (const)
+ * @param [in] window_id The frame window ID object (const)
  * @return The X11 window ID
  */
 FRAME_PUBLIC
 Window frame_x11_get_window_id(UFWindowId window_id);
 
 /**
- * Create a new uTouch Frame window ID object for an X11 window ID
+ * Create a new frame window ID object for an X11 window ID
  *
  * @param [in] id The X11 ID of the window
- * @return The new uTouch Frame window ID object
+ * @return The new frame window ID object
  */
 FRAME_PUBLIC
 UFWindowId frame_x11_create_window_id(Window id);
 
 /**
- * Get the X11 touch ID of a uTouch Frame touch
+ * Get the X11 touch ID of a frame touch
  *
- * @param [in] touch_id The uTouch Frame touch ID object (const)
+ * @param [in] touch_id The frame touch ID object (const)
  * @return The X11 touch ID
  */
 FRAME_PUBLIC
 unsigned int frame_x11_get_touch_id(UFTouchId touch_id);
 
 /**
- * Create a new uTouch Frame touch ID object for an X11 touch ID
+ * Create a new frame touch ID object for an X11 touch ID
  *
  * @param [in] id The X11 ID of the touch
- * @return The new uTouch Frame touch ID object
+ * @return The new frame touch ID object
  */
 FRAME_PUBLIC
 UFTouchId frame_x11_create_touch_id(unsigned int id);
@@ -136,4 +136,4 @@
 }
 #endif
 
-#endif
+#endif // FRAME_OIF_FRAME_X11_H_

=== modified file 'm4/xorg-gtest.m4'
--- m4/xorg-gtest.m4	2012-06-18 18:28:21 +0000
+++ m4/xorg-gtest.m4	2012-07-24 22:45:29 +0000
@@ -74,7 +74,7 @@
 
   PKG_CHECK_MODULES(X11, [x11], [have_x11=yes], [have_x11=no])
 
-  # Check if we should include support for utouch-evemu
+  # Check if we should include support for evemu
   AC_ARG_WITH([evemu],
               [AS_HELP_STRING([--with-evemu],
                               [support Linux input device recording playback
@@ -83,10 +83,10 @@
               [with_evemu=check])
 
   AS_IF([test "x$with_evemu" = xyes],
-        [PKG_CHECK_MODULES(EVEMU, [utouch-evemu], [have_xorg_gtest_evemu=yes])],
+        [PKG_CHECK_MODULES(EVEMU, [evemu], [have_xorg_gtest_evemu=yes])],
         [test "x$with_evemu" = xcheck],
         [PKG_CHECK_MODULES(EVEMU,
-                           [utouch-evemu],
+                           [evemu],
                            [have_xorg_gtest_evemu=yes],
                            [have_xorg_gtest_evemu=no])])
   AS_IF([test "x$have_xorg_gtest_evemu" = xyes],

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-06-18 18:28:21 +0000
+++ src/Makefile.am	2012-07-24 22:45:29 +0000
@@ -1,13 +1,13 @@
-version_script = $(srcdir)/libutouch-frame.ver
-
-lib_LTLIBRARIES = libutouch-frame.la
-
-libutouch_frame_la_LDFLAGS = \
+version_script = $(srcdir)/libframe.ver
+
+lib_LTLIBRARIES = libframe.la
+
+libframe_la_LDFLAGS = \
 	-version-info @LIB_VERSION@ \
 	-Wl,-z,defs -Wl,--as-needed \
 	-Wl,--version-script=$(version_script)
 
-libutouch_frame_la_LIBADD = \
+libframe_la_LIBADD = \
 	-lm \
 	$(EVEMU_LIBS) \
 	$(MTDEV_LIBS) \
@@ -29,13 +29,13 @@
 	$(COVERAGE_CXXFLAGS) \
 	$(XINPUT_CFLAGS)
 
-libutouch_frameincludedir = $(includedir)/utouch
-libutouch_frameinclude_HEADERS = \
-	$(top_srcdir)/include/utouch/frame.h \
-	$(top_srcdir)/include/utouch/frame_internal.h \
-	$(top_srcdir)/include/utouch/frame_x11.h
+libframeincludedir = $(includedir)/oif
+libframeinclude_HEADERS = \
+	$(top_srcdir)/include/oif/frame.h \
+	$(top_srcdir)/include/oif/frame_internal.h \
+	$(top_srcdir)/include/oif/frame_x11.h
 
-libutouch_frame_la_SOURCES = \
+libframe_la_SOURCES = \
 	axis.h \
 	axis.cpp \
 	device.h \

=== modified file 'src/axis.cpp'
--- src/axis.cpp	2012-06-18 18:28:21 +0000
+++ src/axis.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -22,7 +22,7 @@
 
 #include "value.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 UFAxis::UFAxis(UFAxisType type, float min, float max, float resolution)
@@ -30,24 +30,24 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
 extern "C" {
 
 UFAxisType frame_axis_get_type(UFAxis axis) {
-  return static_cast<const utouch::frame::UFAxis*>(axis)->type();
+  return static_cast<const oif::frame::UFAxis*>(axis)->type();
 }
 
 float frame_axis_get_minimum(UFAxis axis) {
-  return static_cast<const utouch::frame::UFAxis*>(axis)->min();
+  return static_cast<const oif::frame::UFAxis*>(axis)->min();
 }
 
 float frame_axis_get_maximum(UFAxis axis) {
-  return static_cast<const utouch::frame::UFAxis*>(axis)->max();
+  return static_cast<const oif::frame::UFAxis*>(axis)->max();
 }
 
 float frame_axis_get_resolution(UFAxis axis) {
-  return static_cast<const utouch::frame::UFAxis*>(axis)->resolution();
+  return static_cast<const oif::frame::UFAxis*>(axis)->resolution();
 }
 
 } // extern "C"

=== modified file 'src/axis.h'
--- src/axis.h	2012-06-18 18:28:21 +0000
+++ src/axis.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,17 +18,17 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_AXIS_H_
-#define UTOUCH_FRAME_AXIS_H_
+#ifndef FRAME_AXIS_H_
+#define FRAME_AXIS_H_
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "property.h"
 
 struct UFAxis_ {
   virtual ~UFAxis_() {}
 };
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFAxis : public UFAxis_ {
@@ -51,6 +51,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_AXIS_H_
+#endif // FRAME_AXIS_H_

=== modified file 'src/device.cpp'
--- src/device.cpp	2012-06-18 18:28:21 +0000
+++ src/device.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -24,7 +24,7 @@
 
 #include "axis.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 UFStatus UFDevice::GetAxisByIndex(unsigned int index, ::UFAxis* axis) const {
@@ -50,7 +50,7 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
 extern "C" {
 
@@ -58,7 +58,7 @@
 UFStatus frame_device_get_property_string_(UFDevice device,
                                            UFDeviceProperty property,
                                            char **value) {
-  return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(
+  return static_cast<const oif::frame::UFDevice*>(device)->GetProperty(
       property,
       value);
 }
@@ -66,7 +66,7 @@
 FRAME_PUBLIC
 UFStatus frame_device_get_property_int_(UFDevice device,
                                         UFDeviceProperty property, int *value) {
-  return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(
+  return static_cast<const oif::frame::UFDevice*>(device)->GetProperty(
       property,
       value);
 }
@@ -75,7 +75,7 @@
 UFStatus frame_device_get_property_unsigned_int_(UFDevice device,
                                                  UFDeviceProperty property,
                                                  unsigned int *value) {
-  return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(
+  return static_cast<const oif::frame::UFDevice*>(device)->GetProperty(
       property,
       value);
 }
@@ -84,21 +84,21 @@
 FRAME_PUBLIC
 UFStatus frame_device_get_property(UFDevice device, UFDeviceProperty property,
                                    void *value) {
-  return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(
+  return static_cast<const oif::frame::UFDevice*>(device)->GetProperty(
       property,
       value);
 }
 
 UFStatus frame_device_get_axis_by_index(UFDevice device, unsigned int index,
                                         UFAxis* axis) {
-  return static_cast<const utouch::frame::UFDevice*>(device)->GetAxisByIndex(
+  return static_cast<const oif::frame::UFDevice*>(device)->GetAxisByIndex(
       index,
       axis);
 }
 
 UFStatus frame_device_get_axis_by_type(UFDevice device, UFAxisType type,
                                        UFAxis* axis) {
-  return static_cast<const utouch::frame::UFDevice*>(device)->GetAxisByType(
+  return static_cast<const oif::frame::UFDevice*>(device)->GetAxisByType(
       type,
       axis);
 }

=== modified file 'src/device.h'
--- src/device.h	2012-06-18 18:28:21 +0000
+++ src/device.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,13 +18,13 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_DEVICE_H_
-#define UTOUCH_FRAME_DEVICE_H_
+#ifndef FRAME_DEVICE_H_
+#define FRAME_DEVICE_H_
 
 #include <map>
 #include <memory>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "axis.h"
 #include "typedefs.h"
 
@@ -32,7 +32,7 @@
   virtual ~UFDevice_() {};
 };
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFDevice : public UFDevice_, public Property<UFDeviceProperty> {
@@ -52,6 +52,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_DEVICE_H_
+#endif // FRAME_DEVICE_H_

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-06-18 18:28:21 +0000
+++ src/event.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -23,7 +23,7 @@
 #include "event.h"
 #include "frame.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 UFEvent::UFEvent(UFEventType type, const Value* data, uint64_t time)
@@ -62,26 +62,26 @@
   ::UFFrame frame;
 
   if (GetProperty(UFEventPropertyFrame, &frame) == UFStatusSuccess)
-    static_cast<utouch::frame::UFFrame*>(frame)->ReleasePreviousFrame();
+    static_cast<oif::frame::UFFrame*>(frame)->ReleasePreviousFrame();
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
 extern "C" {
 
 void frame_event_ref(UFEvent event) {
-  static_cast<utouch::frame::UFEvent*>(event)->Ref();
+  static_cast<oif::frame::UFEvent*>(event)->Ref();
 }
 
 void frame_event_unref(UFEvent event) {
-  static_cast<utouch::frame::UFEvent*>(event)->Unref();
+  static_cast<oif::frame::UFEvent*>(event)->Unref();
 }
 
 FRAME_PUBLIC
 UFStatus frame_event_get_property_type_(UFEvent event, UFEventProperty property,
                                         UFEventType *value) {
-  return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(
+  return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
       property,
       value);
 }
@@ -90,7 +90,7 @@
 UFStatus frame_event_get_property_device_(UFEvent event,
                                           UFEventProperty property,
                                           UFDevice *value) {
-  return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(
+  return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
       property,
       value);
 }
@@ -99,7 +99,7 @@
 UFStatus frame_event_get_property_frame_(UFEvent event,
                                          UFEventProperty property,
                                          UFFrame *value) {
-  return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(
+  return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
       property,
       value);
 }
@@ -108,7 +108,7 @@
 UFStatus frame_event_get_property_uint64_(UFEvent event,
                                           UFEventProperty property,
                                           uint64_t *value) {
-  return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(
+  return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
       property,
       value);
 }
@@ -117,15 +117,15 @@
 FRAME_PUBLIC
 UFStatus frame_event_get_property(UFEvent event, UFEventProperty property,
                                   void *value) {
-  return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(
+  return static_cast<const oif::frame::UFEvent*>(event)->GetProperty(
       property,
       value);
 }
 
 UFEventType frame_event_get_type(UFEvent event) {
   UFEventType type;
-  const utouch::frame::UFEvent* ufevent =
-      static_cast<const utouch::frame::UFEvent*>(event);
+  const oif::frame::UFEvent* ufevent =
+      static_cast<const oif::frame::UFEvent*>(event);
   UFStatus status = ufevent->GetProperty(UFEventPropertyType, &type);
   assert(status == UFStatusSuccess);
   return type;
@@ -133,8 +133,8 @@
 
 uint64_t frame_event_get_time(UFEvent event) {
   uint64_t time;
-  const utouch::frame::UFEvent* ufevent =
-      static_cast<const utouch::frame::UFEvent*>(event);
+  const oif::frame::UFEvent* ufevent =
+      static_cast<const oif::frame::UFEvent*>(event);
   UFStatus status = ufevent->GetProperty(UFEventPropertyTime, &time);
   assert(status == UFStatusSuccess);
   return time;

=== modified file 'src/event.h'
--- src/event.h	2012-06-18 18:28:21 +0000
+++ src/event.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,19 +18,19 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_EVENT_H_
-#define UTOUCH_FRAME_EVENT_H_
+#ifndef FRAME_EVENT_H_
+#define FRAME_EVENT_H_
 
 #include <stdint.h>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "property.h"
 
 struct UFEvent_ {
   virtual ~UFEvent_() {}
 };
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class Value;
@@ -51,6 +51,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_EVENT_H
+#endif // FRAME_EVENT_H

=== modified file 'src/frame.cpp'
--- src/frame.cpp	2012-06-18 18:28:21 +0000
+++ src/frame.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -26,7 +26,7 @@
 #include "touch.h"
 #include "window.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 UFFrame::UFFrame(const SharedWindow& window, const SharedUFFrame& prev)
@@ -184,7 +184,7 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
 extern "C" {
 
@@ -192,8 +192,8 @@
 UFStatus frame_frame_get_property_device_(UFFrame frame,
                                           UFFrameProperty property,
                                           UFDevice *value) {
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   return ufframe->GetProperty(property, value);
 }
 
@@ -201,8 +201,8 @@
 UFStatus frame_frame_get_property_uint64_(UFFrame frame,
                                           UFFrameProperty property,
                                           uint64_t *value) {
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   return ufframe->GetProperty(property, value);
 }
 
@@ -210,8 +210,8 @@
 UFStatus frame_frame_get_property_unsigned_int_(UFFrame frame,
                                                 UFFrameProperty property,
                                                 unsigned int *value) {
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   return ufframe->GetProperty(property, value);
 }
 
@@ -219,50 +219,50 @@
 FRAME_PUBLIC
 UFStatus frame_frame_get_property(UFFrame frame, UFFrameProperty property,
                                   void *value) {
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   return ufframe->GetProperty(property, value);
 }
 
 UFStatus frame_frame_get_touch_by_index(UFFrame frame, unsigned int index,
                                         UFTouch *touch) {
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   return ufframe->GetTouchByIndex(index, touch);
 }
 
 UFStatus frame_frame_get_touch_by_id(UFFrame frame, UFTouchId touch_id,
                                      UFTouch *touch) {
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   return ufframe->GetTouchById(touch_id, touch);
 }
 
 UFStatus frame_frame_get_previous_touch_property(UFFrame frame, UFTouch touch,
                                                  UFTouchProperty property,
                                                  void *value) {
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   return ufframe->GetPreviousTouchProperty(
-      static_cast<const utouch::frame::UFTouch*>(touch),
+      static_cast<const oif::frame::UFTouch*>(touch),
       property,
       value);
 }
 
 UFStatus frame_frame_get_previous_touch_value(UFFrame frame, UFTouch touch,
                                               UFAxisType type, float *value) {
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   return ufframe->GetPreviousTouchValue(
-      static_cast<const utouch::frame::UFTouch*>(touch),
+      static_cast<const oif::frame::UFTouch*>(touch),
       type,
       value);
 }
 
 UFWindowId frame_frame_get_window_id(UFFrame frame) {
   UFWindowId window_id;
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   UFStatus status = ufframe->GetProperty(UFFramePropertyWindowId, &window_id);
   assert(status == UFStatusSuccess);
   return window_id;
@@ -270,8 +270,8 @@
 
 uint32_t frame_frame_get_num_touches(UFFrame frame) {
   unsigned int num_touches;
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   UFStatus status = ufframe->GetProperty(UFFramePropertyNumTouches,
                                          &num_touches);
   assert(status == UFStatusSuccess);
@@ -280,8 +280,8 @@
 
 UFDevice frame_frame_get_device(UFFrame frame) {
   UFDevice device;
-  const utouch::frame::UFFrame* ufframe =
-      static_cast<const utouch::frame::UFFrame*>(frame);
+  const oif::frame::UFFrame* ufframe =
+      static_cast<const oif::frame::UFFrame*>(frame);
   UFStatus status = ufframe->GetProperty(UFFramePropertyDevice, &device);
   assert(status == UFStatusSuccess);
   return device;

=== modified file 'src/frame.h'
--- src/frame.h	2012-06-18 18:28:21 +0000
+++ src/frame.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,14 +18,14 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_FRAME_H_
-#define UTOUCH_FRAME_FRAME_H_
+#ifndef FRAME_FRAME_H_
+#define FRAME_FRAME_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "property.h"
 #include "typedefs.h"
 
@@ -33,7 +33,7 @@
   virtual ~UFFrame_() {}
 };
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFFrame : public UFFrame_, public Property<UFFrameProperty> {
@@ -64,6 +64,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_FRAME_H_
+#endif // FRAME_FRAME_H_

=== modified file 'src/handle.cpp'
--- src/handle.cpp	2012-06-18 18:28:21 +0000
+++ src/handle.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -29,7 +29,7 @@
 
 #include "event.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 UFHandle::UFHandle() : event_fd_(-1), event_queue_() {
@@ -71,16 +71,16 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
 extern "C" {
 
 int frame_get_fd(UFHandle handle) {
-  return static_cast<const utouch::frame::UFHandle*>(handle)->event_fd();
+  return static_cast<const oif::frame::UFHandle*>(handle)->event_fd();
 }
 
 UFStatus frame_get_event(UFHandle handle, UFEvent *event) {
-  return static_cast<utouch::frame::UFHandle*>(handle)->GetEvent(event);
+  return static_cast<oif::frame::UFHandle*>(handle)->GetEvent(event);
 }
 
 } // extern "C"

=== modified file 'src/handle.h'
--- src/handle.h	2012-06-18 18:28:21 +0000
+++ src/handle.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,18 +18,18 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_HANDLE_H_
-#define UTOUCH_FRAME_HANDLE_H_
+#ifndef FRAME_HANDLE_H_
+#define FRAME_HANDLE_H_
 
 #include <queue>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 
 struct UFHandle_ {
   virtual ~UFHandle_() {}
 };
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFEvent;
@@ -55,6 +55,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_HANDLE_H_
+#endif // FRAME_HANDLE_H_

=== renamed file 'src/libutouch-frame.ver' => 'src/libframe.ver'
--- src/libutouch-frame.ver	2012-06-18 18:28:21 +0000
+++ src/libframe.ver	2012-07-24 22:45:29 +0000
@@ -1,10 +1,15 @@
-UTOUCH_FRAME_2.0 {
+FRAME_2.2 {
   global:
     frame_get_fd;
     frame_get_event;
     frame_device_get_property;
+    frame_device_get_property_string_;
+    frame_device_get_property_int_;
+    frame_device_get_property_unsigned_int_;
     frame_device_get_axis_by_index;
     frame_device_get_axis_by_type;
+    frame_device_get_window_resolution_x;
+    frame_device_get_window_resolution_y;
     frame_axis_get_type;
     frame_axis_get_minimum;
     frame_axis_get_maximum;
@@ -12,12 +17,23 @@
     frame_event_ref;
     frame_event_unref;
     frame_event_get_property;
+    frame_event_get_property_type_;
+    frame_event_get_property_device_;
+    frame_event_get_property_frame_;
+    frame_event_get_property_uint64_;
     frame_frame_get_property;
+    frame_frame_get_property_device_;
+    frame_frame_get_property_uint64_;
+    frame_frame_get_property_unsigned_int_;
     frame_frame_get_touch_by_index;
     frame_frame_get_touch_by_id;
     frame_frame_get_previous_touch_property;
     frame_frame_get_previous_touch_value;
     frame_touch_get_property;
+    frame_touch_get_property_uint64_;
+    frame_touch_get_property_state_;
+    frame_touch_get_property_float_;
+    frame_touch_get_property_int_;
     frame_touch_get_value;
 
     frame_event_get_type;
@@ -48,27 +64,3 @@
   local:
     *;
 };
-
-UTOUCH_FRAME_2.1 {
-  global:
-    frame_device_get_property_string_;
-    frame_device_get_property_int_;
-    frame_device_get_property_unsigned_int_;
-    frame_event_get_property_type_;
-    frame_event_get_property_device_;
-    frame_event_get_property_frame_;
-    frame_event_get_property_uint64_;
-    frame_frame_get_property_device_;
-    frame_frame_get_property_uint64_;
-    frame_frame_get_property_unsigned_int_;
-    frame_touch_get_property_uint64_;
-    frame_touch_get_property_state_;
-    frame_touch_get_property_float_;
-    frame_touch_get_property_int_;
-} UTOUCH_FRAME_2.0;
-
-UTOUCH_FRAME_2.2 {
-  global:
-    frame_device_get_window_resolution_x;
-    frame_device_get_window_resolution_y;
-} UTOUCH_FRAME_2.1;

=== modified file 'src/property.h'
--- src/property.h	2012-06-18 18:28:21 +0000
+++ src/property.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,14 +18,14 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_PROPERTY_H_
-#define UTOUCH_FRAME_PROPERTY_H_
+#ifndef FRAME_PROPERTY_H_
+#define FRAME_PROPERTY_H_
 
 #include <map>
 
 #include "value.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 template<typename T>
@@ -67,6 +67,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_PROPERTY_H_
+#endif // FRAME_PROPERTY_H_

=== modified file 'src/touch.cpp'
--- src/touch.cpp	2012-06-18 18:28:21 +0000
+++ src/touch.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -24,7 +24,7 @@
 
 #include "frame.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 UFTouch::UFTouch(UFTouchState state, UFTouchId id, float x, float y,
@@ -79,7 +79,7 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
 extern "C" {
 
@@ -87,8 +87,8 @@
 UFStatus frame_touch_get_property_uint64_(UFTouch touch,
                                           UFTouchProperty property,
                                           uint64_t *value) {
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   return uftouch->GetProperty(property, value);
 }
 
@@ -96,8 +96,8 @@
 UFStatus frame_touch_get_property_state_(UFTouch touch,
                                          UFTouchProperty property,
                                          UFTouchState *value) {
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   return uftouch->GetProperty(property, value);
 }
 
@@ -105,16 +105,16 @@
 UFStatus frame_touch_get_property_float_(UFTouch touch,
                                          UFTouchProperty property,
                                          float *value) {
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   return uftouch->GetProperty(property, value);
 }
 
 FRAME_PUBLIC
 UFStatus frame_touch_get_property_int_(UFTouch touch, UFTouchProperty property,
                                        int *value) {
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   return uftouch->GetProperty(property, value);
 }
 
@@ -122,21 +122,21 @@
 FRAME_PUBLIC
 UFStatus frame_touch_get_property(UFTouch touch, UFTouchProperty property,
                                   void* value) {
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   return uftouch->GetProperty(property, value);
 }
 
 UFStatus frame_touch_get_value(UFTouch touch, UFAxisType type, float* value) {
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   return uftouch->GetValue(type, value);
 }
 
 UFTouchId frame_touch_get_id(UFTouch touch) {
   UFTouchId touch_id;
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   UFStatus status = uftouch->GetProperty(UFTouchPropertyId, &touch_id);
   assert(status == UFStatusSuccess);
   return touch_id;
@@ -144,8 +144,8 @@
 
 UFTouchState frame_touch_get_state(UFTouch touch) {
   UFTouchState state;
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   UFStatus status = uftouch->GetProperty(UFTouchPropertyState, &state);
   assert(status == UFStatusSuccess);
   return state;
@@ -153,8 +153,8 @@
 
 float frame_touch_get_window_x(UFTouch touch) {
   float x;
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowX, &x);
   assert(status == UFStatusSuccess);
   return x;
@@ -162,8 +162,8 @@
 
 float frame_touch_get_window_y(UFTouch touch) {
   float y;
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   UFStatus status = uftouch->GetProperty(UFTouchPropertyWindowY, &y);
   assert(status == UFStatusSuccess);
   return y;
@@ -171,8 +171,8 @@
 
 float frame_touch_get_device_x(UFTouch touch) {
   float x;
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   UFStatus status = uftouch->GetValue(UFAxisTypeX, &x);
   assert(status == UFStatusSuccess);
   return x;
@@ -180,8 +180,8 @@
 
 float frame_touch_get_device_y(UFTouch touch) {
   float y;
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   UFStatus status = uftouch->GetValue(UFAxisTypeY, &y);
   assert(status == UFStatusSuccess);
   return y;
@@ -189,8 +189,8 @@
 
 uint64_t frame_touch_get_time(UFTouch touch) {
   uint64_t time;
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   UFStatus status = uftouch->GetProperty(UFTouchPropertyTime, &time);
   assert(status == UFStatusSuccess);
   return time;
@@ -198,8 +198,8 @@
 
 uint64_t frame_touch_get_start_time(UFTouch touch) {
   uint64_t start_time;
-  const utouch::frame::UFTouch* uftouch =
-      static_cast<const utouch::frame::UFTouch*>(touch);
+  const oif::frame::UFTouch* uftouch =
+      static_cast<const oif::frame::UFTouch*>(touch);
   UFStatus status = uftouch->GetProperty(UFTouchPropertyStartTime, &start_time);
   assert(status == UFStatusSuccess);
   return start_time;

=== modified file 'src/touch.h'
--- src/touch.h	2012-06-18 18:28:21 +0000
+++ src/touch.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,15 +18,15 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_TOUCH_H_
-#define UTOUCH_FRAME_TOUCH_H_
+#ifndef FRAME_TOUCH_H_
+#define FRAME_TOUCH_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "property.h"
 #include "typedefs.h"
 
@@ -34,7 +34,7 @@
   virtual ~UFTouch_() {}
 };
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFTouch : public UFTouch_, public Property<UFTouchProperty> {
@@ -59,6 +59,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_TOUCH_H_
+#endif // FRAME_TOUCH_H_

=== modified file 'src/typedefs.h'
--- src/typedefs.h	2012-06-18 18:28:21 +0000
+++ src/typedefs.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,10 +18,10 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_TYPEDEFS_H_
-#define UTOUCH_FRAME_TYPEDEFS_H_
+#ifndef FRAME_TYPEDEFS_H_
+#define FRAME_TYPEDEFS_H_
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFDevice;
@@ -35,6 +35,6 @@
 typedef std::shared_ptr<Window> SharedWindow;
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_TYPEDEFS_H_
+#endif // FRAME_TYPEDEFS_H_

=== modified file 'src/value.cpp'
--- src/value.cpp	2012-06-18 18:28:21 +0000
+++ src/value.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -28,7 +28,7 @@
 #include "device.h"
 #include "frame.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 Value::Value(bool value) : type_(kBool), bool_(value) {
@@ -228,4 +228,4 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif

=== modified file 'src/value.h'
--- src/value.h	2012-06-18 18:28:21 +0000
+++ src/value.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_VALUE_H_
-#define UTOUCH_FRAME_VALUE_H_
+#ifndef FRAME_VALUE_H_
+#define FRAME_VALUE_H_
 
 #include <stdint.h>
 
@@ -27,14 +27,14 @@
 
 #include <X11/X.h>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "typedefs.h"
 
 #if __SIZEOF_LONG__ != __SIZEOF_LONG_LONG__
 #define HAVE_LONG_UNSIGNED_VALUE
 #endif
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class Value {
@@ -104,6 +104,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_VALUE_H_
+#endif // FRAME_VALUE_H_

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-06-18 18:28:21 +0000
+++ src/window.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -24,7 +24,7 @@
 
 #include "frame.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 Window::Window() : current_frame_(new UFFrame) {
@@ -43,4 +43,4 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif

=== modified file 'src/window.h'
--- src/window.h	2012-06-18 18:28:21 +0000
+++ src/window.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,17 +18,17 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_WINDOW_H_
-#define UTOUCH_FRAME_WINDOW_H_
+#ifndef FRAME_WINDOW_H_
+#define FRAME_WINDOW_H_
 
 #include <map>
 #include <memory>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "property.h"
 #include "typedefs.h"
 
-namespace utouch {
+namespace oif{
 namespace frame {
 
 class Window : public std::enable_shared_from_this<Window> {
@@ -48,6 +48,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_WINDOW_H_
+#endif // FRAME_WINDOW_H_

=== modified file 'src/x11/device_x11.cpp'
--- src/x11/device_x11.cpp	2012-06-18 18:28:21 +0000
+++ src/x11/device_x11.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -27,12 +27,12 @@
 
 #include <xorg/xserver-properties.h>
 
-#include "utouch/frame_x11.h"
+#include "oif/frame_x11.h"
 #include "axis.h"
 #include "value.h"
 #include "x11/window_x11.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 namespace {
@@ -123,7 +123,7 @@
                                    valuator_info->resolution);
 
         axes_[type] =
-            std::move(UniqueUFAxis(static_cast<utouch::frame::UFAxis*>(axis)));
+            std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis)));
 
         axis_map_[valuator_info->number] = type;
 
@@ -171,8 +171,8 @@
                                        SharedUFFrame* frame) {
   /* We don't really know if the ownership event is for a particular window
    * when using the Ubuntu prototype multitouch X server. We just take the first
-   * one for algorithmic completeness, and assume the utouch-frame client will
-   * work around this issue. */
+   * one for algorithmic completeness, and assume the frame client will work
+   * around this issue. */
   for (auto& pair : windows_) {
     WindowX11* window = static_cast<WindowX11*>(pair.second.get());
     if (!window->IsTouchOwned(event->touchid))
@@ -211,21 +211,21 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
 extern "C" {
 
 UFStatus frame_x11_accept_touch(UFDevice device, UFWindowId window,
                                 UFTouchId touch_id) {
-  utouch::frame::UFDeviceX11* device_x11 =
-      static_cast<utouch::frame::UFDeviceX11*>(device);
+  oif::frame::UFDeviceX11* device_x11 =
+      static_cast<oif::frame::UFDeviceX11*>(device);
   return device_x11->AcceptTouch(frame_x11_get_window_id(window), touch_id);
 }
 
 UFStatus frame_x11_reject_touch(UFDevice device, UFWindowId window,
                                 UFTouchId touch_id) {
-  utouch::frame::UFDeviceX11* device_x11 =
-      static_cast<utouch::frame::UFDeviceX11*>(device);
+  oif::frame::UFDeviceX11* device_x11 =
+      static_cast<oif::frame::UFDeviceX11*>(device);
   return device_x11->RejectTouch(frame_x11_get_window_id(window), touch_id);
 }
 

=== modified file 'src/x11/device_x11.h'
--- src/x11/device_x11.h	2012-06-18 18:28:21 +0000
+++ src/x11/device_x11.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,19 +18,19 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_DEVICE_X11_H_
-#define UTOUCH_FRAME_DEVICE_X11_H_
+#ifndef FRAME_DEVICE_X11_H_
+#define FRAME_DEVICE_X11_H_
 
 #include <map>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "device.h"
 #include "typedefs.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFDeviceX11
@@ -60,6 +60,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_DEVICE_X11_H_
+#endif // FRAME_DEVICE_X11_H_

=== modified file 'src/x11/frame_x11.cpp'
--- src/x11/frame_x11.cpp	2012-06-18 18:28:21 +0000
+++ src/x11/frame_x11.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-12 Canonical Ltd.
  *
@@ -22,18 +22,18 @@
 
 #include <X11/Xlib.h>
 
-#include "utouch/frame.h"
-#include "utouch/frame_x11.h"
+#include "oif/frame.h"
+#include "oif/frame_x11.h"
 #include "x11/handle_x11.h"
 
 extern "C" {
 
 UFStatus frame_x11_new(Display* display, ::UFHandle* handle) {
-  utouch::frame::UFHandleX11** handle_x11 =
-      reinterpret_cast<utouch::frame::UFHandleX11**>(handle);
+  oif::frame::UFHandleX11** handle_x11 =
+      reinterpret_cast<oif::frame::UFHandleX11**>(handle);
 
   try {
-    *handle_x11 = new utouch::frame::UFHandleX11(display);
+    *handle_x11 = new oif::frame::UFHandleX11(display);
     return UFStatusSuccess;
   } catch (const std::exception& exception) {
     *handle_x11 = NULL;
@@ -43,14 +43,14 @@
 
 UFStatus frame_x11_process_event(UFHandle handle,
                                  XGenericEventCookie* xcookie) {
-  utouch::frame::UFHandleX11* handle_x11 =
-      static_cast<utouch::frame::UFHandleX11*>(handle);
+  oif::frame::UFHandleX11* handle_x11 =
+      static_cast<oif::frame::UFHandleX11*>(handle);
   return handle_x11->ProcessEvent(xcookie);
 }
 
 void frame_x11_delete(UFHandle handle) {
-  utouch::frame::UFHandleX11* handle_x11 =
-      static_cast<utouch::frame::UFHandleX11*>(handle);
+  oif::frame::UFHandleX11* handle_x11 =
+      static_cast<oif::frame::UFHandleX11*>(handle);
   delete handle_x11;
 }
 

=== modified file 'src/x11/handle_x11.cpp'
--- src/x11/handle_x11.cpp	2012-06-18 18:28:21 +0000
+++ src/x11/handle_x11.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -25,12 +25,12 @@
 
 #include <stdexcept>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "event.h"
 #include "value.h"
 #include "x11/device_x11.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 UFHandleX11::UFHandleX11(Display *display)
@@ -186,4 +186,4 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif

=== modified file 'src/x11/handle_x11.h'
--- src/x11/handle_x11.h	2012-06-18 18:28:21 +0000
+++ src/x11/handle_x11.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_HANDLE_X11_H_
-#define UTOUCH_FRAME_HANDLE_X11_H_
+#ifndef FRAME_HANDLE_X11_H_
+#define FRAME_HANDLE_X11_H_
 
 #include <stdint.h>
 
@@ -32,7 +32,7 @@
 #include "handle.h"
 #include "typedefs.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFHandleX11 : public UFHandle {
@@ -57,6 +57,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_HANDLE_X11_H_
+#endif // FRAME_HANDLE_X11_H_

=== modified file 'src/x11/window_x11.cpp'
--- src/x11/window_x11.cpp	2012-07-17 14:27:52 +0000
+++ src/x11/window_x11.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -22,13 +22,13 @@
 
 #include <stdio.h>
 
-#include "utouch/frame_x11.h"
+#include "oif/frame_x11.h"
 #include "frame.h"
 #include "touch.h"
 #include "value.h"
 #include "x11/device_x11.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 WindowX11::WindowX11(::Window window, const SharedUFDevice& device,
@@ -101,7 +101,7 @@
 
   int i = 0; /* Current XI axis number */
   int j = 0; /* Current XI valuator value offset in event */
-  int k = 0; /* Number of handled utouch-frame axes */
+  int k = 0; /* Number of handled frame axes */
   for (;
        i < event->valuators.mask_len * 8 &&
        k < static_cast<int>(device_->axis_map().size());
@@ -206,4 +206,4 @@
 }
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif

=== modified file 'src/x11/window_x11.h'
--- src/x11/window_x11.h	2012-07-17 14:27:52 +0000
+++ src/x11/window_x11.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011-2012 Canonical Ltd.
  *
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_WINDOW_X11_H_
-#define UTOUCH_FRAME_WINDOW_X11_H_
+#ifndef FRAME_WINDOW_X11_H_
+#define FRAME_WINDOW_X11_H_
 
 #include <map>
 #include <memory>
@@ -28,11 +28,11 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 #include "typedefs.h"
 #include "window.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 
 class UFDeviceX11;
@@ -61,6 +61,6 @@
 };
 
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_WINDOW_X11_H_
+#endif // FRAME_WINDOW_X11_H_

=== modified file 'test/integration/Makefile.am'
--- test/integration/Makefile.am	2012-07-18 12:59:17 +0000
+++ test/integration/Makefile.am	2012-07-24 22:45:29 +0000
@@ -43,7 +43,7 @@
 # internal symbols.
 #
 check_integration_LDADD = \
-	$(top_builddir)/src/.libs/libutouch-frame.a \
+	$(top_builddir)/src/.libs/libframe.a \
 	$(top_builddir)/test/gtest/libgtest.a \
 	$(top_builddir)/test/gtest/libxorg-gtest.a \
 	$(top_builddir)/test/gtest/libxorg-gtest_main.a \

=== modified file 'test/integration/events.cpp'
--- test/integration/events.cpp	2012-07-17 13:55:33 +0000
+++ test/integration/events.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011 Canonical Ltd.
  *
@@ -23,7 +23,7 @@
 
 #include <stdexcept>
 
-namespace utouch {
+namespace oif {
 namespace frame {
 namespace testing {
 
@@ -45,8 +45,8 @@
   return value;
 }
 
-bool IsEqual(const utouch::frame::testing::Touch& a,
-             const utouch::frame::testing::Touch& b) {
+bool IsEqual(const oif::frame::testing::Touch& a,
+             const oif::frame::testing::Touch& b) {
   /* We rely on the fact that values are stored in maps, so if the values are
    * equal they will also be stored in the same order. */
   for (auto property_a = a.first.cbegin(), property_b = b.first.cbegin();
@@ -87,4 +87,4 @@
 
 } // namespace testing
 } // namespace frame
-} // namespace utouch
+} // namespace oif

=== modified file 'test/integration/events.h'
--- test/integration/events.h	2012-07-17 13:55:33 +0000
+++ test/integration/events.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011 Canonical Ltd.
  *
@@ -19,15 +19,15 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_TEST_EVENTS_H_
-#define UTOUCH_FRAME_TEST_EVENTS_H_
+#ifndef FRAME_TEST_EVENTS_H_
+#define FRAME_TEST_EVENTS_H_
 
 #include <map>
 #include <vector>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 namespace testing {
 
@@ -53,6 +53,6 @@
 
 } // namespace testing
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_TEST_EVENTS_H_
+#endif // FRAME_TEST_EVENTS_H_

=== modified file 'test/integration/x11/device.cpp'
--- test/integration/x11/device.cpp	2012-03-22 15:45:48 +0000
+++ test/integration/x11/device.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011 Canonical Ltd.
  *
@@ -23,9 +23,9 @@
 #include <stdexcept>
 
 #include "x11/fixture.h"
-#include "utouch/frame_x11.h"
+#include "oif/frame_x11.h"
 
-using namespace utouch::frame::x11::testing;
+using namespace oif::frame::x11::testing;
 
 class FrameDeviceTest : public Test {
  public:

=== modified file 'test/integration/x11/dynamic_type_checking.cpp'
--- test/integration/x11/dynamic_type_checking.cpp	2012-03-21 16:00:02 +0000
+++ test/integration/x11/dynamic_type_checking.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011 Canonical Ltd.
  *
@@ -30,7 +30,7 @@
 
 #include "x11/fixture.h"
 
-using namespace utouch::frame::x11::testing;
+using namespace oif::frame::x11::testing;
 
 class DynamicTypeTest : public Test {
  public:

=== modified file 'test/integration/x11/fixture.cpp'
--- test/integration/x11/fixture.cpp	2012-02-11 00:24:29 +0000
+++ test/integration/x11/fixture.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011 Canonical Ltd.
  *
@@ -24,10 +24,10 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 
-#include "utouch/frame.h"
-#include "utouch/frame_x11.h"
+#include "oif/frame.h"
+#include "oif/frame_x11.h"
 
-void utouch::frame::x11::testing::Test::SetUp() {
+void oif::frame::x11::testing::Test::SetUp() {
   ASSERT_NO_FATAL_FAILURE(xorg::testing::Test::SetUp());
 
   int xi_major = 2;
@@ -67,7 +67,7 @@
   ASSERT_TRUE(handle_ != NULL);
 }
 
-void utouch::frame::x11::testing::Test::PumpEvents(uint64_t timeout) {
+void oif::frame::x11::testing::Test::PumpEvents(uint64_t timeout) {
   fd_set set;
   FD_ZERO(&set);
 
@@ -126,7 +126,7 @@
   }
 }
 
-void utouch::frame::x11::testing::Test::TearDown() {
+void oif::frame::x11::testing::Test::TearDown() {
   frame_x11_delete(handle_);
   xorg::testing::Test::TearDown();
 }

=== modified file 'test/integration/x11/fixture.h'
--- test/integration/x11/fixture.h	2012-03-22 15:45:48 +0000
+++ test/integration/x11/fixture.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011 Canonical Ltd.
  *
@@ -19,14 +19,14 @@
  *
  ****************************************************************************/
 
-#ifndef UTOUCH_FRAME_TEST_FIXTURE_H_
-#define UTOUCH_FRAME_TEST_FIXTURE_H_
+#ifndef FRAME_TEST_FIXTURE_H_
+#define FRAME_TEST_FIXTURE_H_
 
 #include <xorg/gtest/xorg-gtest.h>
 
-#include "utouch/frame.h"
+#include "oif/frame.h"
 
-namespace utouch {
+namespace oif {
 namespace frame {
 namespace x11 {
 namespace testing {
@@ -54,6 +54,6 @@
 } // namespace testing
 } // namespace x11
 } // namespace frame
-} // namespace utouch
+} // namespace oif
 
-#endif // UTOUCH_FRAME_TEST_FIXTURE_H_
+#endif // FRAME_TEST_FIXTURE_H_

=== modified file 'test/integration/x11/ids.cpp'
--- test/integration/x11/ids.cpp	2011-12-07 02:28:31 +0000
+++ test/integration/x11/ids.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011 Canonical Ltd.
  *
@@ -21,7 +21,7 @@
 
 #include <gtest/gtest.h>
 
-#include "utouch/frame_x11.h"
+#include "oif/frame_x11.h"
 
 TEST(FrameTest, IDs) {
   Window x11_window_id = 0x892347;

=== modified file 'test/integration/x11/recording.cpp'
--- test/integration/x11/recording.cpp	2012-03-22 15:45:48 +0000
+++ test/integration/x11/recording.cpp	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2011 Canonical Ltd.
  *
@@ -23,9 +23,9 @@
 
 #include "events.h"
 #include "x11/fixture.h"
-#include "utouch/frame_x11.h"
+#include "oif/frame_x11.h"
 
-using namespace utouch::frame::x11::testing;
+using namespace oif::frame::x11::testing;
 
 class FrameRecordingTest : public Test {
  public:
@@ -41,15 +41,15 @@
   FrameRecordingTest& operator=(const FrameRecordingTest&) = delete;
 
  protected:
-  static const utouch::frame::testing::Events events_;
+  static const oif::frame::testing::Events events_;
 
   virtual void ProcessFrameEvents();
   void CheckFrame(UFFrame frame, uint64_t event_time);
   void CheckTouch(UFFrame frame, unsigned int touch_index, uint64_t event_time);
-  void CheckProperty(const utouch::frame::testing::Property& property,
+  void CheckProperty(const oif::frame::testing::Property& property,
                      UFTouch touch, UFFrame frame, int touch_index,
                      bool check_prev);
-  void CheckAxisValue(const utouch::frame::testing::AxisValue& axis_value,
+  void CheckAxisValue(const oif::frame::testing::AxisValue& axis_value,
                       UFTouch touch, UFFrame frame, int touch_index,
                       bool check_prev);
 
@@ -140,8 +140,8 @@
    * us to properly check the previous property and axis values. */
   if (step_ > 0) {
     for (const auto& pair : touch_map_) {
-      const utouch::frame::testing::Touch* touch;
-      const utouch::frame::testing::Properties* properties;
+      const oif::frame::testing::Touch* touch;
+      const oif::frame::testing::Properties* properties;
       UFTouchState state;
 
       /* Check if the size of the touch map is at most the expected size for
@@ -212,7 +212,7 @@
             frame_frame_get_touch_by_index(frame, touch_index, &touch));
 
   UFTouchId id = frame_touch_get_id(touch);
-  const utouch::frame::testing::Touch& expected = events_[step_][touch_index];
+  const oif::frame::testing::Touch& expected = events_[step_][touch_index];
 
   /* Check each property */
   for (const auto& property : expected.first)
@@ -240,10 +240,10 @@
         << "Step " << step_ << ", Touch " << id;
 
     int slot = touch_map_[id];
-    const utouch::frame::testing::Touch& prev_expected =
+    const oif::frame::testing::Touch& prev_expected =
         events_[step_ - 1][slot];
 
-    if (utouch::frame::testing::IsEqual(expected, prev_expected)) {
+    if (oif::frame::testing::IsEqual(expected, prev_expected)) {
       EXPECT_EQ(touch_times_[id], frame_touch_get_time(touch))
           << "Step " << step_ << ", Touch " << id;
     } else {
@@ -268,7 +268,7 @@
 }
 
 void FrameRecordingTest::CheckProperty(
-    const utouch::frame::testing::Property& property,
+    const oif::frame::testing::Property& property,
     UFTouch touch,
     UFFrame frame,
     int touch_index,
@@ -344,7 +344,7 @@
 }
 
 void FrameRecordingTest::CheckAxisValue(
-    const utouch::frame::testing::AxisValue& axis_value,
+    const oif::frame::testing::AxisValue& axis_value,
     UFTouch touch,
     UFFrame frame,
     int touch_index,
@@ -410,7 +410,7 @@
 /* Construct the expected events */
 namespace {
 
-using namespace utouch::frame::testing;
+using namespace oif::frame::testing;
 
 const Touch ConstructTouch(UFTouchState state, float window_x, float window_y,
                            bool owned, bool pending_end, float x, float y,
@@ -645,5 +645,5 @@
 } // namespace
 
 /* Now initialize the static test fixture member */
-const utouch::frame::testing::Events
+const oif::frame::testing::Events
     FrameRecordingTest::events_(ConstructEvents());

=== modified file 'test/regular/Makefile.am'
--- test/regular/Makefile.am	2012-07-18 12:59:17 +0000
+++ test/regular/Makefile.am	2012-07-24 22:45:29 +0000
@@ -9,12 +9,12 @@
 
 check_c_compile_SOURCES = check-c-compile.c
 check_c_compile_LDADD = \
-	$(top_builddir)/src/libutouch-frame.la \
+	$(top_builddir)/src/libframe.la \
 	$(COVERAGE_LIBS)
 
 check_cxx_compile_SOURCES = check-cxx-compile.cpp
 check_cxx_compile_LDADD = \
-	$(top_builddir)/src/libutouch-frame.la \
+	$(top_builddir)/src/libframe.la \
 	$(COVERAGE_LIBS)
 
 check-static-type-checking$(EXEEXT):
@@ -38,7 +38,7 @@
 # internal symbols.
 #
 check_regular_LDADD = \
-	$(top_builddir)/src/.libs/libutouch-frame.a \
+	$(top_builddir)/src/.libs/libframe.a \
 	$(top_builddir)/test/gtest/libgtest.a \
 	$(top_builddir)/test/gtest/libgtest_main.a \
 	$(top_builddir)/test/x11_mocks/libx11_mocks.a \

=== modified file 'test/regular/check-c-compile.c'
--- test/regular/check-c-compile.c	2012-07-17 13:55:33 +0000
+++ test/regular/check-c-compile.c	2012-07-24 22:45:29 +0000
@@ -2,7 +2,7 @@
  * Test compiling and linking with a plain C compiler.
  */
 
-#include <utouch/frame_x11.h>
+#include "include/oif/frame_x11.h"
 
 int main(int argc, char **argv) {
   UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0);

=== modified file 'test/regular/check-cxx-compile.cpp'
--- test/regular/check-cxx-compile.cpp	2012-07-17 13:55:33 +0000
+++ test/regular/check-cxx-compile.cpp	2012-07-24 22:45:29 +0000
@@ -2,7 +2,7 @@
  * Test compiling and linking with a C++ compiler.
  */
 
-#include<utouch/frame_x11.h>
+#include "include/oif/frame_x11.h"
 
 int main(int argc, char **argv) {
   UFWindowId id __attribute__((unused)) = frame_x11_create_window_id(0);

=== modified file 'test/regular/check-static-type-checking.c'
--- test/regular/check-static-type-checking.c	2012-07-17 13:55:33 +0000
+++ test/regular/check-static-type-checking.c	2012-07-24 22:45:29 +0000
@@ -4,7 +4,7 @@
  * test is merely to check that the improper type mechanism is working at all.
  */
 
-#include <utouch/frame.h>
+#include <oif/frame.h>
 
 #ifdef __has_extension
 #if __has_extension(c_generic_selections)

=== modified file 'test/regular/frame-fixture.h'
--- test/regular/frame-fixture.h	2012-07-17 14:27:23 +0000
+++ test/regular/frame-fixture.h	2012-07-24 22:45:29 +0000
@@ -2,8 +2,8 @@
 #define GTEST_FRAME_FIXTURE_H
 
 #include <gtest/gtest.h>
-#include "utouch/frame.h"
-#include "utouch/frame_x11.h"
+#include "oif/frame.h"
+#include "oif/frame_x11.h"
 
 class FrameFixture : public ::testing::Test
 {

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2012-06-18 18:28:21 +0000
+++ tools/Makefile.am	2012-07-24 22:45:29 +0000
@@ -6,24 +6,24 @@
 
 commondir = common
 
-bin_PROGRAMS = utouch-frame-test-x11
+bin_PROGRAMS = frame-test-x11
 
-utouch_frame_test_x11_SOURCES = utouch-frame-test-x11.c \
+frame_test_x11_SOURCES = frame-test-x11.c \
 	common/device.c \
 	common/device.h \
 	common/frame.c \
 	common/frame.h \
 	common/touch.c \
 	common/touch.h \
-	utouch-frame-test-x11.txt
+	frame-test-x11.txt
 
-utouch_frame_test_x11_LDADD = \
+frame_test_x11_LDADD = \
 	$(XINPUT_LIBS) \
-	$(top_builddir)/src/libutouch-frame.la \
+	$(top_builddir)/src/libframe.la \
 	$(COVERAGE_LIBS) \
 	$(CXX_LIBS)
 
-local_manpages = utouch-frame-test-x11.1
+local_manpages = frame-test-x11.1
 
 if HAVE_DOCTOOLS
 dist_man_MANS = $(local_manpages)

=== removed file 'tools/common-defs.h'
--- tools/common-defs.h	2011-09-10 15:58:14 +0000
+++ tools/common-defs.h	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*****************************************************************************
- *
- * utouch-frame - Touch Frame Library
- *
- * Copyright (C) 2010-2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Henrik Rydberg <[e-mail]>
- *
- ****************************************************************************/
-
-static void report_device_caps(utouch_frame_handle fh)
-{
-	const struct utouch_surface *s = utouch_frame_get_surface(fh);
-
-	fprintf(stderr, "device props:\n");
-	if (s->needs_pointer)
-		fprintf(stderr, "\tpointer\n");
-	if (s->is_direct)
-		fprintf(stderr, "\tdirect\n");
-	if (s->is_buttonpad)
-		fprintf(stderr, "\tbuttonpad\n");
-	if (s->is_semi_mt)
-		fprintf(stderr, "\tsemi_mt\n");
-	fprintf(stderr, "device mt events:\n");
-	if (s->use_touch_major)
-		fprintf(stderr, "\ttouch_major\n");
-	if (s->use_touch_minor)
-		fprintf(stderr, "\ttouch_minor\n");
-	if (s->use_width_major)
-		fprintf(stderr, "\twidth_major\n");
-	if (s->use_width_minor)
-		fprintf(stderr, "\twidth_minor\n");
-	if (s->use_orientation)
-		fprintf(stderr, "\torientation\n");
-	if (s->use_pressure)
-		fprintf(stderr, "\tpressure\n");
-	if (s->use_distance)
-		fprintf(stderr, "\tdistance\n");
-}
-
-static void report_frame(const struct utouch_frame *frame)
-{
-	int i;
-
-	for (i = 0; i < frame->num_active; i++) {
-		const struct utouch_contact *t = frame->active[i];
-
-		fprintf(stderr, "touch %d\n", i);
-		fprintf(stderr, "  slot:         %d\n", t->slot);
-		fprintf(stderr, "  id:           %d\n", t->id);
-		fprintf(stderr, "  tool_type:    %d\n", t->tool_type);
-		fprintf(stderr, "  x:            %f\n", t->x);
-		fprintf(stderr, "  y:            %f\n", t->y);
-		fprintf(stderr, "  touch_major:  %f\n", t->touch_major);
-		fprintf(stderr, "  touch_minor:  %f\n", t->touch_minor);
-		fprintf(stderr, "  width_major:  %f\n", t->width_major);
-		fprintf(stderr, "  width_minor:  %f\n", t->width_minor);
-		fprintf(stderr, "  angle:        %f\n", t->orientation);
-		fprintf(stderr, "  pressure:     %f\n", t->pressure);
-		fprintf(stderr, "  distance:     %f\n", t->distance);
-		fprintf(stderr, "  vx:           %f\n", t->vx);
-		fprintf(stderr, "  vy:           %f\n", t->vy);
-	}
-
-	fprintf(stderr, "sync %d %jd %d %d %d\n",
-		frame->num_active,
-		frame->time,
-		frame->sequence_id,
-		frame->revision,
-		frame->slot_revision);
-}

=== modified file 'tools/common/device.c'
--- tools/common/device.c	2011-09-29 21:20:29 +0000
+++ tools/common/device.c	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2011 Canonical Ltd.
  *

=== modified file 'tools/common/device.h'
--- tools/common/device.h	2011-09-29 21:20:29 +0000
+++ tools/common/device.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
@@ -19,7 +19,7 @@
  *
  ****************************************************************************/
 
-#include <utouch/frame.h>
+#include <oif/frame.h>
 
 void get_axis_info(UFAxis axis, UFAxisType *type, const char **name, float *min,
                    float *max, float *res);

=== modified file 'tools/common/frame.c'
--- tools/common/frame.c	2011-12-25 21:29:09 +0000
+++ tools/common/frame.c	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
@@ -25,7 +25,7 @@
 
 #include <X11/X.h>
 
-#include <utouch/frame_x11.h>
+#include <oif/frame_x11.h>
 
 #include "common/touch.h"
 

=== modified file 'tools/common/frame.h'
--- tools/common/frame.h	2011-09-29 21:20:29 +0000
+++ tools/common/frame.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
@@ -19,6 +19,6 @@
  *
  ****************************************************************************/
 
-#include <utouch/frame.h>
+#include <oif/frame.h>
 
 void print_frame(UFHandle handle, UFEvent event);

=== modified file 'tools/common/touch.c'
--- tools/common/touch.c	2011-11-09 18:14:17 +0000
+++ tools/common/touch.c	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 
-#include <utouch/frame_x11.h>
+#include <oif/frame_x11.h>
 
 #include "common/device.h"
 

=== modified file 'tools/common/touch.h'
--- tools/common/touch.h	2011-09-29 21:20:29 +0000
+++ tools/common/touch.h	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
@@ -20,6 +20,6 @@
  ****************************************************************************/
 
 #include <X11/X.h>
-#include <utouch/frame.h>
+#include <oif/frame.h>
 
 void print_touch(UFTouch touch, UFFrame frame, UFDevice device, Window window);

=== renamed file 'tools/utouch-frame-test-x11.c' => 'tools/frame-test-x11.c'
--- tools/utouch-frame-test-x11.c	2012-02-11 00:24:29 +0000
+++ tools/frame-test-x11.c	2012-07-24 22:45:29 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * utouch-frame - Touch Frame Library
+ * frame - Touch Frame Library
  *
  * Copyright (C) 2010-2011 Canonical Ltd.
  *
@@ -26,8 +26,8 @@
 #include <sys/select.h>
 
 #include <X11/extensions/XInput2.h>
-#include <utouch/frame.h>
-#include <utouch/frame_x11.h>
+#include <oif/frame.h>
+#include <oif/frame_x11.h>
 
 #include "common/device.h"
 #include "common/frame.h"
@@ -168,7 +168,7 @@
 
   status = frame_x11_new(display, &frame_handle);
   if (status != UFStatusSuccess) {
-    fprintf(stderr, "Error: failed to create utouch frame instance\n");
+    fprintf(stderr, "Error: failed to create frame instance\n");
     return -1;
   }
 

=== renamed file 'tools/utouch-frame-test-x11.txt' => 'tools/frame-test-x11.txt'
--- tools/utouch-frame-test-x11.txt	2011-08-27 01:29:53 +0000
+++ tools/frame-test-x11.txt	2012-07-24 22:45:29 +0000
@@ -1,18 +1,18 @@
-UTOUCH-FRAME-TEST-X11(1)
-==========================
+FRAME-TEST-X11(1)
+=================
 
 NAME
 ----
 
-  utouch-frame-test-x11 - Report touch frame events from X.org input devices
+  frame-test-x11 - Report touch frame events from X.org input devices
 
 SYNOPSIS
 --------
 
-  utouch-frame-test-x11
+  frame-test-x11
 
 DESCRIPTION
 -----------
 
 A test tool used to analyse the capabilities and act as a test driver for the
-uTouch-Frame library.
+frame library.

=== removed file 'tools/utouch-frame-test-mtdev.c'
--- tools/utouch-frame-test-mtdev.c	2011-12-25 21:27:31 +0000
+++ tools/utouch-frame-test-mtdev.c	1970-01-01 00:00:00 +0000
@@ -1,169 +0,0 @@
-/*****************************************************************************
- *
- * utouch-frame - Touch Frame Library
- *
- * Copyright (C) 2010-2011 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *      Henrik Rydberg <[e-mail]>
- *
- ****************************************************************************/
-
-#define MTDEV_NO_LEGACY_API
-
-#define _POSIX_SOURCE
-
-#include <utouch/frame-mtdev.h>
-#include <mtdev.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include "common-defs.h"
-
-struct frame_test {
-	struct evemu_device *evemu;
-	struct mtdev *mtdev;
-	utouch_frame_handle fh;
-	struct stat fs;
-	FILE *fptest;
-	int fd;
-};
-
-static int init_evemu(struct frame_test *test)
-{
-	test->evemu = evemu_new(NULL);
-	if (!test->evemu)
-		return -1;
-	if (test->fptest)
-		return evemu_read(test->evemu, test->fptest) <= 0;
-	return evemu_extract(test->evemu, test->fd);
-}
-
-static int init_mtdev(struct frame_test *test)
-{
-	if (test->fptest)
-		return 0;
-	test->mtdev = mtdev_new_open(test->fd);
-	if (!test->mtdev)
-		return -1;
-	return 0;
-}
-
-static int init_frame(struct frame_test *test)
-{
-	test->fh = utouch_frame_new_engine(100, 32, 100);
-	if (!test->fh)
-		return -1;
-	return utouch_frame_init_mtdev(test->fh, test->evemu);
-}
-
-static void destroy_all(struct frame_test *test)
-{
-	utouch_frame_delete_engine(test->fh);
-	if (test->mtdev)
-		mtdev_close_delete(test->mtdev);
-	evemu_delete(test->evemu);
-	if (test->fptest)
-		fclose(test->fptest);
-	else
-		ioctl(test->fd, EVIOCGRAB, 0);
-	close(test->fd);
-	memset(test, 0, sizeof(*test));
-}
-
-static void loop_device(struct frame_test *test)
-{
-	FILE * fp = test->fptest;
-	const struct utouch_frame *frame;
-	struct input_event ev;
-
-	if (fp) {
-		struct timeval evtime;
-		memset(&evtime, 0, sizeof(evtime));
-		while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) {
-			frame = utouch_frame_pump_mtdev(test->fh, &ev);
-			if (frame)
-				report_frame(frame);
-		}
-	} else {
-		while (!mtdev_idle(test->mtdev, test->fd, 5000)) {
-			while (mtdev_get(test->mtdev, test->fd, &ev, 1) > 0) {
-				frame = utouch_frame_pump_mtdev(test->fh, &ev);
-				if (frame)
-					report_frame(frame);
-			}
-		}
-	}
-}
-
-int main(int argc, char *argv[])
-{
-	struct frame_test test;
-
-	if (argc < 2) {
-		fprintf(stderr, "Usage: %s <device>\n", argv[0]);
-		return -1;
-	}
-
-	memset(&test, 0, sizeof(test));
-
-	test.fd = open(argv[1], O_RDONLY | O_NONBLOCK);
-	if (test.fd < 0) {
-		fprintf(stderr, "error: could not open device\n");
-		return -1;
-	}
-	if (fstat(test.fd, &test.fs)) {
-		fprintf(stderr, "error: could not stat the device\n");
-		return -1;
-	}
-	if (!test.fs.st_rdev)
-		test.fptest = fdopen(test.fd, "r");
-
-	if (!test.fptest && ioctl(test.fd, EVIOCGRAB, 1)) {
-		fprintf(stderr, "error: could not grab the device\n");
-		return -1;
-	}
-
-	if (init_evemu(&test)) {
-		fprintf(stderr, "error: could not describe device\n");
-		return -1;
-	}
-	if (!utouch_frame_is_supported_mtdev(test.evemu)) {
-		fprintf(stderr, "error: unsupported device\n");
-		return -1;
-	}
-
-	fprintf(stderr, "device: %s\n", evemu_get_name(test.evemu));
-
-	if (init_mtdev(&test)) {
-		fprintf(stderr, "error: could not init mtdev\n");
-		return -1;
-	}
-	if (init_frame(&test)) {
-		fprintf(stderr, "error: could not init frame\n");
-		return -1;
-	}
-
-	report_device_caps(test.fh);
-
-	loop_device(&test);
-
-	destroy_all(&test);
-
-	return 0;
-}

=== removed file 'tools/utouch-frame-test-mtdev.txt'
--- tools/utouch-frame-test-mtdev.txt	2011-02-03 16:07:34 +0000
+++ tools/utouch-frame-test-mtdev.txt	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-UTOUCH-FRAME-TEST-MTDEV(1)
-==========================
-
-NAME
-----
-
-  utouch-frame-test-mtdev - describe a device and report frame events
-
-SYNOPSIS
---------
-
-  utouch-frame-test-mtdev device
-
-DESCRIPTION
------------
-
-A test tool used to analyse the capabilities and act as a test driver for the
-uTouch touch frame library.
-
-AUTHOR
-------
-utouch-frame-test-mtdev was written by Henrik Rydberg <[e-mail]>