diff --git a/swig/annotationmatch.i b/swig/annotationmatch.i
index 1edda40a4478d46d2ebe75bbefc52545d2275d7a..d0225ad72a2fb2c333692d1fa07d2d1ca08ca66d 100644
--- a/swig/annotationmatch.i
+++ b/swig/annotationmatch.i
@@ -7,7 +7,7 @@
 %}
 
 %include "matchdata.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 
diff --git a/swig/expression.i b/swig/expression.i
index 0d10cb4f492a39f39596fd25893dc70317d8ca51..b15393c7a5b529b8e136c3270a610b290778dbc9 100644
--- a/swig/expression.i
+++ b/swig/expression.i
@@ -7,7 +7,7 @@
   #include <boost/noncopyable.hpp>
 %}
 
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 %include "std_string.i"
 
 namespace Wccl {
diff --git a/swig/match.i b/swig/match.i
index 0c817a12f84d4873110a32d2c13dcc043c73e0e6..f296bb3d54b478410832efaf10e72ab3eee4efb9 100644
--- a/swig/match.i
+++ b/swig/match.i
@@ -11,7 +11,7 @@
 %include "tokenmatch.i"
 %include "annotationmatch.i"
 %include "matchvector.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 // %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/matchdata.i b/swig/matchdata.i
index e7501410a48e6f06789686a9a16d97a0c03bb9bd..57d7afa3bf708cdceab277b88724ea9f57661a26 100644
--- a/swig/matchdata.i
+++ b/swig/matchdata.i
@@ -7,7 +7,7 @@
 %}
 
 %include "match.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/matchrule.i b/swig/matchrule.i
index 887e81e5c895da8d07c4e384d45bb8907dab6bed..41002c613db3ad9ec124e46686c8abd08b9847ca 100644
--- a/swig/matchrule.i
+++ b/swig/matchrule.i
@@ -8,7 +8,7 @@
 
 %include "variables.i"
 %include "parsedexpression.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/matchrulesequence.i b/swig/matchrulesequence.i
index 0f975e85ba98a49e881009ddc76162a04dfbe720..73c27e8d03986c207614b977c2fc3955a8fc6535 100644
--- a/swig/matchrulesequence.i
+++ b/swig/matchrulesequence.i
@@ -8,7 +8,7 @@
 
 %include "matchrule.i"
 %include "expression.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"
diff --git a/swig/matchvector.i b/swig/matchvector.i
index 8df311a01140ca4cd01def42b856f9f8c3a0f041..955b9c4a13051985971bfaedde504d012f964604 100644
--- a/swig/matchvector.i
+++ b/swig/matchvector.i
@@ -10,7 +10,7 @@
 %include "matchdata.i"
 %include "tokenmatch.i"
 %include "annotationmatch.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/parser.i b/swig/parser.i
index e8a0c9b0fc654ee191eefb7c3d55b826c78db1f4..6ec1d5d4acff6f77c2fda9abb069051a148fc55a 100644
--- a/swig/parser.i
+++ b/swig/parser.i
@@ -12,7 +12,7 @@
 %include "wcclfile.i"
 %include "functionaloperator.i"
 
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %include "std_string.i"
 %include "std_vector.i"
diff --git a/swig/sentencecontext.i b/swig/sentencecontext.i
index 87c69b9c3f8c4dc4bf92c914e99cb2d11219c3c5..10fa25fa76149e23837b4ccbec2aac3ab9a76ee2 100644
--- a/swig/sentencecontext.i
+++ b/swig/sentencecontext.i
@@ -6,9 +6,9 @@
   #include <libwccl/sentencecontext.h>
 %}
 
-%include "libcorpus2/libcorpustoken.i"
-%include "libcorpus2/libcorpuslexeme.i"
-%include "libcorpus2/libcorpussentence.i"
+%include "libcorpus2/token.i"
+%include "libcorpus2/lexeme.i"
+%include "libcorpus2/sentence.i"
 
 %include "position.i"
 
diff --git a/swig/tagrule.i b/swig/tagrule.i
index ad8c5021a9dbd1d9bc69ea1c6402e4c5cb198b97..b8029fcaf3d468bddccd5610fcb39d0f377c813a 100644
--- a/swig/tagrule.i
+++ b/swig/tagrule.i
@@ -12,7 +12,7 @@
 %include "sentencecontext.i"
 %include "parsedexpression.i"
 
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/tagrulesequence.i b/swig/tagrulesequence.i
index 55f0fba161cdb4cbcec245c4601e0a7cbc5a55e6..31b0bfd6fe37369fb0d1b527ac8a3554f3c5fb57 100644
--- a/swig/tagrulesequence.i
+++ b/swig/tagrulesequence.i
@@ -9,7 +9,7 @@
 %include "bool.i"
 %include "tagrule.i"
 %include "expression.i"
-%include "libcorpus2/libcorpussentence.i"
+%include "libcorpus2/sentence.i"
 
 %include "std_string.i"
 %include "std_vector.i"
diff --git a/swig/tokenmatch.i b/swig/tokenmatch.i
index 5ace23860f367fcd0bd0dbc2e6478648e43b68ad..d556cf76867ced93f4c870c29def3df5cc98b513 100644
--- a/swig/tokenmatch.i
+++ b/swig/tokenmatch.i
@@ -7,7 +7,7 @@
 %}
 
 %include "matchdata.i"
-%include "libcorpus2/libcorpusannotatedsentence.i"
+%include "libcorpus2/annotatedsentence.i"
 
 %nodefaultctor Wccl::TokenMatch;
 
diff --git a/swig/tset.i b/swig/tset.i
index 4afc4c5bf112d03190703bd5748481652ae4567c..54a7880c14000001d30dd1e660a0d0b665e42384 100644
--- a/swig/tset.i
+++ b/swig/tset.i
@@ -10,8 +10,8 @@
 /* Include required headers */
 %include "std_string.i"
 %include "value.i"
-%include "libcorpus2/libcorpustag.i"
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tag.i"
+%include "libcorpus2/tagset.i"
 
 %feature("notabstract") Wccl::TSet;
 
diff --git a/swig/value.i b/swig/value.i
index 2bec67110be61d415a047c35b0694d78cc1cff57..30f8eefb203b114d7905733953ae326f53a33887 100644
--- a/swig/value.i
+++ b/swig/value.i
@@ -7,7 +7,7 @@
 %}
 
 %include "std_string.i"
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %nodefaultctor Wccl::Value;
 
diff --git a/swig/wcclfile.i b/swig/wcclfile.i
index 76922e3debd6afe215224fc408b07c5060aa770a..8e0fe411fb23f8ccca567bf92222d7e897bf36f0 100644
--- a/swig/wcclfile.i
+++ b/swig/wcclfile.i
@@ -19,7 +19,7 @@
 %include "wcclfileopsections.i"
 %include "functionalopsequence.i"
 
-%include "libcorpus2/libcorpustagset.i"
+%include "libcorpus2/tagset.i"
 
 %include "std_string.i"
 %include "std_vector.i"