diff --git a/swig/libcclactionexeccontext.i b/swig/actionexeccontext.i
similarity index 91%
rename from swig/libcclactionexeccontext.i
rename to swig/actionexeccontext.i
index 528164bc7ce3c4f43b11f5b16b0eabb240751d1d..61084ad4259f7ffa78ecd9fd8dbf65968b4decde 100644
--- a/swig/libcclactionexeccontext.i
+++ b/swig/actionexeccontext.i
@@ -6,8 +6,8 @@
   #include <libwccl/ops/tagaction.h>
 %}
 
-%include "libcclvariables.i"
-%include "libcclsentencecontext.i"
+%include "variables.i"
+%include "sentencecontext.i"
 
 namespace Wccl {
   class ActionExecContext {
diff --git a/swig/libcclannotationmatch.i b/swig/annotationmatch.i
similarity index 97%
rename from swig/libcclannotationmatch.i
rename to swig/annotationmatch.i
index ac1d4cb319b0c5596596f1dea3f946892d23d880..1edda40a4478d46d2ebe75bbefc52545d2275d7a 100644
--- a/swig/libcclannotationmatch.i
+++ b/swig/annotationmatch.i
@@ -6,7 +6,7 @@
   #include <libwccl/values/annotationmatch.h>
 %}
 
-%include "libcclmatchdata.i"
+%include "matchdata.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclbool.i b/swig/bool.i
similarity index 96%
rename from swig/libcclbool.i
rename to swig/bool.i
index d19104da8d09502e82138bce0e62d6f70f36b522..7f4ff3a8e88ef94888f4ba13f692fb67bbbf6fe2 100644
--- a/swig/libcclbool.i
+++ b/swig/bool.i
@@ -7,7 +7,7 @@
   #include <libwccl/values/bool.h>
 %}
 
-%include "libcclvalue.i"
+%include "value.i"
 %include "std_string.i"
 
 %feature("notabstract") Wccl::Bool;
diff --git a/swig/libcclexpression.i b/swig/expression.i
similarity index 100%
rename from swig/libcclexpression.i
rename to swig/expression.i
diff --git a/swig/libcclfunctionaloperator.i b/swig/functionaloperator.i
similarity index 88%
rename from swig/libcclfunctionaloperator.i
rename to swig/functionaloperator.i
index c4ccc8a93a36b1a32e936b7a85ffea9008b1cc5f..9ae78cf821ed1e11e8cc5bf7a8f9dbc03684d340 100644
--- a/swig/libcclfunctionaloperator.i
+++ b/swig/functionaloperator.i
@@ -6,10 +6,10 @@
   #include <libwccl/ops/operator.h>
 %}
 
-%include "libcclvalue.i"
-%include "libcclvariables.i"
-%include "libcclsentencecontext.i"
-%include "libcclparsedexpression.i"
+%include "value.i"
+%include "variables.i"
+%include "sentencecontext.i"
+%include "parsedexpression.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libcclfunctionalopsequence.i b/swig/functionalopsequence.i
similarity index 98%
rename from swig/libcclfunctionalopsequence.i
rename to swig/functionalopsequence.i
index b66e4e4cc1c0ffa59e39f0a275f6d332b90d9955..4d1aefff0ec1b7c4869231259ebb7be517aee942 100644
--- a/swig/libcclfunctionalopsequence.i
+++ b/swig/functionalopsequence.i
@@ -6,9 +6,9 @@
   #include <libwccl/ops/opsequence.h>
 %}
 
-%include "libccloperator.i"
-%include "libcclexpression.i"
-%include "libcclfunctionaloperator.i"
+%include "operator.i"
+%include "expression.i"
+%include "functionaloperator.i"
 
 %include "std_pair.i"
 %include "std_string.i"
diff --git a/swig/libccllexicon.i b/swig/lexicon.i
similarity index 98%
rename from swig/libccllexicon.i
rename to swig/lexicon.i
index 1a3f136bb2e4a40bceab960776101e3d572894b1..b9004e4dc74595796b05b4216193ac020964a870 100644
--- a/swig/libccllexicon.i
+++ b/swig/lexicon.i
@@ -9,7 +9,7 @@
   #include <boost/unordered_map.hpp>
 %}
 
-%include "libcclstrset.i"
+%include "strset.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libccllexicons.i b/swig/lexicons.i
similarity index 98%
rename from swig/libccllexicons.i
rename to swig/lexicons.i
index b56538601d40adf3110e1be3cc08689925fc62cd..a1b1c701f02f470b69a5a39700c679942e31bc20 100644
--- a/swig/libccllexicons.i
+++ b/swig/lexicons.i
@@ -6,7 +6,7 @@
   #include <libwccl/lexicon/lexicons.h>
 %}
 
-%include "libccllexicon.i"
+%include "lexicon.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libcclmatch.i b/swig/match.i
similarity index 93%
rename from swig/libcclmatch.i
rename to swig/match.i
index 321d130a75d94027a3792974abfb4d1cb6728e77..0c817a12f84d4873110a32d2c13dcc043c73e0e6 100644
--- a/swig/libcclmatch.i
+++ b/swig/match.i
@@ -6,11 +6,11 @@
   #include <libwccl/values/match.h>
 %}
 
-%include "libcclvalue.i"
-%include "libcclmatchdata.i"
-%include "libccltokenmatch.i"
-%include "libcclannotationmatch.i"
-%include "libcclmatchvector.i"
+%include "value.i"
+%include "matchdata.i"
+%include "tokenmatch.i"
+%include "annotationmatch.i"
+%include "matchvector.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclmatchdata.i b/swig/matchdata.i
similarity index 98%
rename from swig/libcclmatchdata.i
rename to swig/matchdata.i
index c92eae202e0ec7a0e3635ca49172dc0cad4955a0..e7501410a48e6f06789686a9a16d97a0c03bb9bd 100644
--- a/swig/libcclmatchdata.i
+++ b/swig/matchdata.i
@@ -6,7 +6,7 @@
   #include <libwccl/values/matchdata.h>
 %}
 
-%include "libcclmatch.i"
+%include "match.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclmatchrule.i b/swig/matchrule.i
similarity index 95%
rename from swig/libcclmatchrule.i
rename to swig/matchrule.i
index b80319e1e28331cd966d4d6250e63251423b0b27..887e81e5c895da8d07c4e384d45bb8907dab6bed 100644
--- a/swig/libcclmatchrule.i
+++ b/swig/matchrule.i
@@ -6,8 +6,8 @@
   #include <libwccl/ops/matchrule.h>
 %}
 
-%include "libcclvariables.i"
-%include "libcclparsedexpression.i"
+%include "variables.i"
+%include "parsedexpression.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclmatchrulesequence.i b/swig/matchrulesequence.i
similarity index 95%
rename from swig/libcclmatchrulesequence.i
rename to swig/matchrulesequence.i
index d68f5fd0561787a2268ec846d04f7e5061b7d3ac..0f975e85ba98a49e881009ddc76162a04dfbe720 100644
--- a/swig/libcclmatchrulesequence.i
+++ b/swig/matchrulesequence.i
@@ -6,8 +6,8 @@
   #include <libwccl/ops/matchrulesequence.h>
 %}
 
-%include "libcclmatchrule.i"
-%include "libcclexpression.i"
+%include "matchrule.i"
+%include "expression.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libcclmatchvector.i b/swig/matchvector.i
similarity index 93%
rename from swig/libcclmatchvector.i
rename to swig/matchvector.i
index d96af40d4f4cd14ac121250880ef9b7decbaef16..8df311a01140ca4cd01def42b856f9f8c3a0f041 100644
--- a/swig/libcclmatchvector.i
+++ b/swig/matchvector.i
@@ -6,10 +6,10 @@
   #include <libwccl/values/matchvector.h>
 %}
 
-%include "libcclmatch.i"
-%include "libcclmatchdata.i"
-%include "libccltokenmatch.i"
-%include "libcclannotationmatch.i"
+%include "match.i"
+%include "matchdata.i"
+%include "tokenmatch.i"
+%include "annotationmatch.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %include "std_string.i"
diff --git a/swig/libccloperator.i b/swig/operator.i
similarity index 93%
rename from swig/libccloperator.i
rename to swig/operator.i
index 450d5551a1c4b5ea54a3a88bee3da4e23fc46c5e..fa7c5c9134d0719ffbdae661496dd16fbb232e04 100644
--- a/swig/libccloperator.i
+++ b/swig/operator.i
@@ -7,13 +7,13 @@
 %}
 
 
-%include "libcclvalue.i"
-%include "libcclsentencecontext.i"
-%include "libcclfunctionaloperator.i"
+%include "value.i"
+%include "sentencecontext.i"
+%include "functionaloperator.i"
 
 /*
-%include "libcclvariables.i"
-%include "libcclparsedexpression.i"
+%include "variables.i"
+%include "parsedexpression.i"
 */
 
 %include "std_string.i"
diff --git a/swig/libcclparsedexpression.i b/swig/parsedexpression.i
similarity index 91%
rename from swig/libcclparsedexpression.i
rename to swig/parsedexpression.i
index 8c9e2b3591ff10a612d423e648245ec403235abb..6fcffb016421c31c748e4bda08735c2182833e9b 100644
--- a/swig/libcclparsedexpression.i
+++ b/swig/parsedexpression.i
@@ -6,14 +6,14 @@
   #include <libwccl/ops/parsedexpression.h>
 %}
 
-%include "libcclvalue.i"
+%include "value.i"
 
-%include "libcclmatch.i"
-%include "libcclbool.i"
-%include "libccltset.i"
-%include "libcclstrset.i"
-%include "libcclposition.i"
-%include "libcclexpression.i"
+%include "match.i"
+%include "bool.i"
+%include "tset.i"
+%include "strset.i"
+%include "position.i"
+%include "expression.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libcclparser.i b/swig/parser.i
similarity index 95%
rename from swig/libcclparser.i
rename to swig/parser.i
index 950f5a35e81ea03ce0ca993ed74e052548d18d8e..2da5c3a2115b6643c09744c56409be88083a97bf 100644
--- a/swig/libcclparser.i
+++ b/swig/parser.i
@@ -6,11 +6,11 @@
   #include <libwccl/parser/Parser.h>
 %}
 
-%include "libccltagrule.i"
-%include "libccltagrulesequence.i"
-%include "libcclmatchrule.i"
-%include "libcclwcclfile.i"
-%include "libcclfunctionaloperator.i"
+%include "tagrule.i"
+%include "tagrulesequence.i"
+%include "matchrule.i"
+%include "wcclfile.i"
+%include "functionaloperator.i"
 
 %include "libcorpus2/libcorpustagset.i"
 
diff --git a/swig/libcclposition.i b/swig/position.i
similarity index 97%
rename from swig/libcclposition.i
rename to swig/position.i
index b0ce83f1f82f4aa71310ef89a9b9d5a010f330b9..c5d1698af84329764eae266b01e41f0423ae5f25 100644
--- a/swig/libcclposition.i
+++ b/swig/position.i
@@ -8,7 +8,7 @@
   #include <boost/integer_traits.hpp>
 %}
 
-%include "libcclvalue.i"
+%include "value.i"
 %include "std_string.i"
 
 %feature("notabstract") Wccl::Position;
diff --git a/swig/libcclsentencecontext.i b/swig/sentencecontext.i
similarity index 98%
rename from swig/libcclsentencecontext.i
rename to swig/sentencecontext.i
index 462662680aec0560e0c7603f5d54fb320e3bcf41..87c69b9c3f8c4dc4bf92c914e99cb2d11219c3c5 100644
--- a/swig/libcclsentencecontext.i
+++ b/swig/sentencecontext.i
@@ -10,7 +10,7 @@
 %include "libcorpus2/libcorpuslexeme.i"
 %include "libcorpus2/libcorpussentence.i"
 
-%include "libcclposition.i"
+%include "position.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/libcclstrset.i b/swig/strset.i
similarity index 98%
rename from swig/libcclstrset.i
rename to swig/strset.i
index fc2f444a12422a5f1e4b7d29df9feb8817625571..4591c0e7a91e13684297acf823241c95176f268a 100644
--- a/swig/libcclstrset.i
+++ b/swig/strset.i
@@ -9,7 +9,7 @@
   #include <libcorpus2/lexeme.h>
 %}
 
-%include "libcclvalue.i"
+%include "value.i"
 %include "std_string.i"
 
 %feature("notabstract") Wccl::StrSet;
diff --git a/swig/libccltagaction.i b/swig/tagaction.i
similarity index 83%
rename from swig/libccltagaction.i
rename to swig/tagaction.i
index 7d0e477a1f001c05bfbbb8b5fd5f11f853e95a12..3067137703536e84dbab204fa1043eebe3e9d19e 100644
--- a/swig/libccltagaction.i
+++ b/swig/tagaction.i
@@ -6,9 +6,9 @@
   #include <libwccl/ops/tagaction.h>
 %}
 
-%include "libcclbool.i"
-%include "libcclexpression.i"
-%include "libcclactionexeccontext.i"
+%include "bool.i"
+%include "expression.i"
+%include "actionexeccontext.i"
 
 %include "std_string.i"
 
diff --git a/swig/libccltagrule.i b/swig/tagrule.i
similarity index 92%
rename from swig/libccltagrule.i
rename to swig/tagrule.i
index b6f2f8156e4b9f0d7ec9536f033f4cd2cfbe252a..ad8c5021a9dbd1d9bc69ea1c6402e4c5cb198b97 100644
--- a/swig/libccltagrule.i
+++ b/swig/tagrule.i
@@ -6,11 +6,11 @@
   #include <libwccl/ops/tagrule.h>
 %}
 
-%include "libcclbool.i"
-%include "libccltagaction.i"
-%include "libcclvariables.i"
-%include "libcclsentencecontext.i"
-%include "libcclparsedexpression.i"
+%include "bool.i"
+%include "tagaction.i"
+%include "variables.i"
+%include "sentencecontext.i"
+%include "parsedexpression.i"
 
 %include "libcorpus2/libcorpustagset.i"
 
diff --git a/swig/libccltagrulesequence.i b/swig/tagrulesequence.i
similarity index 94%
rename from swig/libccltagrulesequence.i
rename to swig/tagrulesequence.i
index 0f7f22445cb0e8037022f170f7c8d7aa310eda40..55f0fba161cdb4cbcec245c4601e0a7cbc5a55e6 100644
--- a/swig/libccltagrulesequence.i
+++ b/swig/tagrulesequence.i
@@ -6,9 +6,9 @@
   #include <libwccl/ops/tagrulesequence.h>
 %}
 
-%include "libcclbool.i"
-%include "libccltagrule.i"
-%include "libcclexpression.i"
+%include "bool.i"
+%include "tagrule.i"
+%include "expression.i"
 %include "libcorpus2/libcorpussentence.i"
 
 %include "std_string.i"
diff --git a/swig/libccltokenmatch.i b/swig/tokenmatch.i
similarity index 96%
rename from swig/libccltokenmatch.i
rename to swig/tokenmatch.i
index 64834122d9ca1cbbe277cd37ce603a37d5e650d4..5ace23860f367fcd0bd0dbc2e6478648e43b68ad 100644
--- a/swig/libccltokenmatch.i
+++ b/swig/tokenmatch.i
@@ -6,7 +6,7 @@
   #include <libwccl/values/tokenmatch.h>
 %}
 
-%include "libcclmatchdata.i"
+%include "matchdata.i"
 %include "libcorpus2/libcorpusannotatedsentence.i"
 
 %nodefaultctor Wccl::TokenMatch;
diff --git a/swig/libccltset.i b/swig/tset.i
similarity index 98%
rename from swig/libccltset.i
rename to swig/tset.i
index 79b792f6e9210ce5c4847739e655e8e2afc96044..4afc4c5bf112d03190703bd5748481652ae4567c 100644
--- a/swig/libccltset.i
+++ b/swig/tset.i
@@ -9,7 +9,7 @@
 
 /* Include required headers */
 %include "std_string.i"
-%include "libcclvalue.i"
+%include "value.i"
 %include "libcorpus2/libcorpustag.i"
 %include "libcorpus2/libcorpustagset.i"
 
diff --git a/swig/libcclvalue.i b/swig/value.i
similarity index 100%
rename from swig/libcclvalue.i
rename to swig/value.i
diff --git a/swig/libcclvariables.i b/swig/variables.i
similarity index 97%
rename from swig/libcclvariables.i
rename to swig/variables.i
index 98bd25f114d010f0916a863157ba8890cc9fceac..00eb421d3b8b257d38d40f8846d8d4574f2db088 100644
--- a/swig/libcclvariables.i
+++ b/swig/variables.i
@@ -6,12 +6,12 @@
   #include <libwccl/variables.h>
 %}
 
-%include "libcclvalue.i"
-%include "libcclmatch.i"
-%include "libcclbool.i"
-%include "libcclposition.i"
-%include "libcclstrset.i"
-%include "libccltset.i"
+%include "value.i"
+%include "match.i"
+%include "bool.i"
+%include "position.i"
+%include "strset.i"
+%include "tset.i"
 
 %include "std_string.i"
 %include <libcorpus2/boost_shared_ptr.i>
diff --git a/swig/wccl.i b/swig/wccl.i
index c97e40f5f189162f3f5cfbd4dffab43b19f940cb..6d85be88ee46ae1635048a6644d81d38b25e8316 100644
--- a/swig/wccl.i
+++ b/swig/wccl.i
@@ -6,33 +6,33 @@
   //
 %}
 %include <libcorpus2/unicodestring.i>
-%include "libcclactionexeccontext.i"
-%include "libcclannotationmatch.i"
-%include "libcclbool.i"
-%include "libcclexpression.i"
-%include "libcclfunctionaloperator.i"
-%include "libcclmatchdata.i"
-%include "libcclmatch.i"
-%include "libcclmatchrule.i"
-%include "libcclmatchvector.i"
-%include "libccloperator.i"
-%include "libcclparsedexpression.i"
-%include "libcclparser.i"
-%include "libcclposition.i"
-%include "libcclsentencecontext.i"
-%include "libcclstrset.i"
-%include "libccltagaction.i"
-%include "libccltagrule.i"
-%include "libccltagrulesequence.i"
-%include "libccltokenmatch.i"
-%include "libccltset.i"
-%include "libcclvalue.i"
-%include "libcclvariables.i"
-%include "libcclfunctionalopsequence.i"
-%include "libcclwcclfileopsections.i"
-%include "libcclmatchrulesequence.i"
-%include "libccllexicon.i"
-%include "libccllexicons.i"
-%include "libcclwcclfile.i"
+%include "actionexeccontext.i"
+%include "annotationmatch.i"
+%include "bool.i"
+%include "expression.i"
+%include "functionaloperator.i"
+%include "matchdata.i"
+%include "match.i"
+%include "matchrule.i"
+%include "matchvector.i"
+%include "operator.i"
+%include "parsedexpression.i"
+%include "parser.i"
+%include "position.i"
+%include "sentencecontext.i"
+%include "strset.i"
+%include "tagaction.i"
+%include "tagrule.i"
+%include "tagrulesequence.i"
+%include "tokenmatch.i"
+%include "tset.i"
+%include "value.i"
+%include "variables.i"
+%include "functionalopsequence.i"
+%include "wcclfileopsections.i"
+%include "matchrulesequence.i"
+%include "lexicon.i"
+%include "lexicons.i"
+%include "wcclfile.i"
 
 #endif /* SWIG_LIBWCCL_I */
diff --git a/swig/libcclwcclfile.i b/swig/wcclfile.i
similarity index 97%
rename from swig/libcclwcclfile.i
rename to swig/wcclfile.i
index 7752e6aa19581cad8744321cacbee57307e87429..76922e3debd6afe215224fc408b07c5060aa770a 100644
--- a/swig/libcclwcclfile.i
+++ b/swig/wcclfile.i
@@ -6,18 +6,18 @@
   #include <libwccl/wcclfile.h>
 %}
 
-%include "libcclbool.i"
-%include "libccltset.i"
-%include "libcclmatch.i"
-%include "libcclstrset.i"
-%include "libcclposition.i"
-%include "libccllexicon.i"
-%include "libccllexicons.i"
-%include "libccltagrulesequence.i"
-%include "libcclmatchrulesequence.i"
-%include "libcclfunctionaloperator.i"
-%include "libcclwcclfileopsections.i"
-%include "libcclfunctionalopsequence.i"
+%include "bool.i"
+%include "tset.i"
+%include "match.i"
+%include "strset.i"
+%include "position.i"
+%include "lexicon.i"
+%include "lexicons.i"
+%include "tagrulesequence.i"
+%include "matchrulesequence.i"
+%include "functionaloperator.i"
+%include "wcclfileopsections.i"
+%include "functionalopsequence.i"
 
 %include "libcorpus2/libcorpustagset.i"
 
diff --git a/swig/libcclwcclfileopsections.i b/swig/wcclfileopsections.i
similarity index 94%
rename from swig/libcclwcclfileopsections.i
rename to swig/wcclfileopsections.i
index a8ee450585b2dbf8edc50eee70f005f5ad4da9b8..8b222409a18bfc652ee49cf4d834b82000d544b4 100644
--- a/swig/libcclwcclfileopsections.i
+++ b/swig/wcclfileopsections.i
@@ -6,13 +6,13 @@
   #include <libwccl/wcclfileopsections.h>
 %}
 
-%include "libcclbool.i"
-%include "libcclmatch.i"
-%include "libcclposition.i"
-%include "libcclstrset.i"
-%include "libccltset.i"
-%include "libcclvalue.i"
-%include "libcclfunctionalopsequence.i"
+%include "bool.i"
+%include "match.i"
+%include "position.i"
+%include "strset.i"
+%include "tset.i"
+%include "value.i"
+%include "functionalopsequence.i"
 
 %include "std_string.i"
 %include "std_vector.i"