1 files changed, 12 insertions, 11 deletions

diff --git a/bindings/swig/versekey.i b/bindings/swig/versekey.i
index b396c5a..539989d 100644
--- a/bindings/swig/versekey.i
+++ b/bindings/swig/versekey.i
@@ -1,6 +1,6 @@
 %{
 #include "versekey.h"
-#include "versemgr.h"
+#include "versificationmgr.h"
 %}
 
 
@@ -12,6 +12,7 @@
 %ignore sword::VerseKey::builtin_books;
 %ignore sword::VerseKey::BMAX;
 %ignore sword::VerseKey::books;
+%ignore sword::VerseKey::VerseKey(SWKey const &);
 
 %immutable sword::VerseKey::builtin_abbrevs;
 %immutable sword::sbook::name;
@@ -19,7 +20,7 @@
 %immutable sword::abbrev::ab;
 
 %include "versekey.h"
-%include "versemgr.h"
+%include "versificationmgr.h"
 
 %extend sword::abbrev {
 	int getAbbrevCount() {
@@ -66,7 +67,7 @@
 
 
     const int getBookCount(){
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         return system->getBookCount();
@@ -86,7 +87,7 @@
 			return 0;
 		}
 
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         
@@ -94,7 +95,7 @@
             (testament == 2) ? self->BMAX[0] : 0
         );
 
-        const sword::VerseMgr::Book* b = system->getBook(book_num);
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
         if(!b) {
             fprintf(stderr, "b is null for %d?!?\n", book_num);
             return 0;
@@ -105,14 +106,14 @@
 	};
 
     int getBookNumberByOSISName( const char* bookname ) {
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         return system->getBookNumberByOSISName(bookname);
    }
     
     const char* getOSISBookName( const int book ) {
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
    		if ( (book < 0) || (book >= system->getBookCount()))
@@ -135,7 +136,7 @@
 			return 0;
 		}
 
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         
@@ -143,7 +144,7 @@
             (testament == 2) ? self->BMAX[0] : 0
         );
 
-        const sword::VerseMgr::Book* b = system->getBook(book_num);
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
         if(!b) {
             fprintf(stderr, "b is null for %d?!?\n", book_num);
             return 0;
@@ -164,7 +165,7 @@
 			return 0;
 		}
 
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         
@@ -172,7 +173,7 @@
             (testament == 2) ? self->BMAX[0] : 0
         );
 
-        const sword::VerseMgr::Book* b = system->getBook(book_num);
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
         if(!b) {
             fprintf(stderr, "b is null for %d?!?\n", book_num);
             return 0;