OpenNI modules fixes for new naming