diff --git a/bench/pom.xml b/bench/pom.xml
index 5b3acbd..cc4b96d 100644
--- a/bench/pom.xml
+++ b/bench/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>com.softwaremill.jox</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>channels</artifactId>
             <version>0.2.1</version>
         </dependency>
     </dependencies>
diff --git a/core/pom.xml b/channels/pom.xml
similarity index 98%
rename from core/pom.xml
rename to channels/pom.xml
index ed45867..d2e7c73 100644
--- a/core/pom.xml
+++ b/channels/pom.xml
@@ -9,7 +9,7 @@
         <version>0.2.1</version>
     </parent>
 
-    <artifactId>core</artifactId>
+    <artifactId>channels</artifactId>
     <version>0.2.1</version>
     <packaging>jar</packaging>
 
diff --git a/core/src/main/java/com/softwaremill/jox/Channel.java b/channels/src/main/java/com/softwaremill/jox/Channel.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/Channel.java
rename to channels/src/main/java/com/softwaremill/jox/Channel.java
diff --git a/core/src/main/java/com/softwaremill/jox/ChannelClosed.java b/channels/src/main/java/com/softwaremill/jox/ChannelClosed.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/ChannelClosed.java
rename to channels/src/main/java/com/softwaremill/jox/ChannelClosed.java
diff --git a/core/src/main/java/com/softwaremill/jox/ChannelClosedException.java b/channels/src/main/java/com/softwaremill/jox/ChannelClosedException.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/ChannelClosedException.java
rename to channels/src/main/java/com/softwaremill/jox/ChannelClosedException.java
diff --git a/core/src/main/java/com/softwaremill/jox/ChannelDone.java b/channels/src/main/java/com/softwaremill/jox/ChannelDone.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/ChannelDone.java
rename to channels/src/main/java/com/softwaremill/jox/ChannelDone.java
diff --git a/core/src/main/java/com/softwaremill/jox/ChannelDoneException.java b/channels/src/main/java/com/softwaremill/jox/ChannelDoneException.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/ChannelDoneException.java
rename to channels/src/main/java/com/softwaremill/jox/ChannelDoneException.java
diff --git a/core/src/main/java/com/softwaremill/jox/ChannelError.java b/channels/src/main/java/com/softwaremill/jox/ChannelError.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/ChannelError.java
rename to channels/src/main/java/com/softwaremill/jox/ChannelError.java
diff --git a/core/src/main/java/com/softwaremill/jox/ChannelErrorException.java b/channels/src/main/java/com/softwaremill/jox/ChannelErrorException.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/ChannelErrorException.java
rename to channels/src/main/java/com/softwaremill/jox/ChannelErrorException.java
diff --git a/core/src/main/java/com/softwaremill/jox/CloseableChannel.java b/channels/src/main/java/com/softwaremill/jox/CloseableChannel.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/CloseableChannel.java
rename to channels/src/main/java/com/softwaremill/jox/CloseableChannel.java
diff --git a/core/src/main/java/com/softwaremill/jox/CollectSource.java b/channels/src/main/java/com/softwaremill/jox/CollectSource.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/CollectSource.java
rename to channels/src/main/java/com/softwaremill/jox/CollectSource.java
diff --git a/core/src/main/java/com/softwaremill/jox/Segment.java b/channels/src/main/java/com/softwaremill/jox/Segment.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/Segment.java
rename to channels/src/main/java/com/softwaremill/jox/Segment.java
diff --git a/core/src/main/java/com/softwaremill/jox/Select.java b/channels/src/main/java/com/softwaremill/jox/Select.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/Select.java
rename to channels/src/main/java/com/softwaremill/jox/Select.java
diff --git a/core/src/main/java/com/softwaremill/jox/SelectClause.java b/channels/src/main/java/com/softwaremill/jox/SelectClause.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/SelectClause.java
rename to channels/src/main/java/com/softwaremill/jox/SelectClause.java
diff --git a/core/src/main/java/com/softwaremill/jox/Sink.java b/channels/src/main/java/com/softwaremill/jox/Sink.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/Sink.java
rename to channels/src/main/java/com/softwaremill/jox/Sink.java
diff --git a/core/src/main/java/com/softwaremill/jox/Source.java b/channels/src/main/java/com/softwaremill/jox/Source.java
similarity index 100%
rename from core/src/main/java/com/softwaremill/jox/Source.java
rename to channels/src/main/java/com/softwaremill/jox/Source.java
diff --git a/core/src/main/java/module-info.java b/channels/src/main/java/module-info.java
similarity index 100%
rename from core/src/main/java/module-info.java
rename to channels/src/main/java/module-info.java
diff --git a/core/src/test/java/com/softwaremill/jox/ChannelBufferedTest.java b/channels/src/test/java/com/softwaremill/jox/ChannelBufferedTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/ChannelBufferedTest.java
rename to channels/src/test/java/com/softwaremill/jox/ChannelBufferedTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/ChannelClosedTest.java b/channels/src/test/java/com/softwaremill/jox/ChannelClosedTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/ChannelClosedTest.java
rename to channels/src/test/java/com/softwaremill/jox/ChannelClosedTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/ChannelInterruptionTest.java b/channels/src/test/java/com/softwaremill/jox/ChannelInterruptionTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/ChannelInterruptionTest.java
rename to channels/src/test/java/com/softwaremill/jox/ChannelInterruptionTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/ChannelRendezvousTest.java b/channels/src/test/java/com/softwaremill/jox/ChannelRendezvousTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/ChannelRendezvousTest.java
rename to channels/src/test/java/com/softwaremill/jox/ChannelRendezvousTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/ChannelTest.java b/channels/src/test/java/com/softwaremill/jox/ChannelTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/ChannelTest.java
rename to channels/src/test/java/com/softwaremill/jox/ChannelTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/ChannelUnlimitedTest.java b/channels/src/test/java/com/softwaremill/jox/ChannelUnlimitedTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/ChannelUnlimitedTest.java
rename to channels/src/test/java/com/softwaremill/jox/ChannelUnlimitedTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/CollectSourceTest.java b/channels/src/test/java/com/softwaremill/jox/CollectSourceTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/CollectSourceTest.java
rename to channels/src/test/java/com/softwaremill/jox/CollectSourceTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/SegmentRendezvousTest.java b/channels/src/test/java/com/softwaremill/jox/SegmentRendezvousTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/SegmentRendezvousTest.java
rename to channels/src/test/java/com/softwaremill/jox/SegmentRendezvousTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/SegmentTest.java b/channels/src/test/java/com/softwaremill/jox/SegmentTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/SegmentTest.java
rename to channels/src/test/java/com/softwaremill/jox/SegmentTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/SelectReceiveTest.java b/channels/src/test/java/com/softwaremill/jox/SelectReceiveTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/SelectReceiveTest.java
rename to channels/src/test/java/com/softwaremill/jox/SelectReceiveTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/SelectSendTest.java b/channels/src/test/java/com/softwaremill/jox/SelectSendTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/SelectSendTest.java
rename to channels/src/test/java/com/softwaremill/jox/SelectSendTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/SelectTest.java b/channels/src/test/java/com/softwaremill/jox/SelectTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/SelectTest.java
rename to channels/src/test/java/com/softwaremill/jox/SelectTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/StressTest.java b/channels/src/test/java/com/softwaremill/jox/StressTest.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/StressTest.java
rename to channels/src/test/java/com/softwaremill/jox/StressTest.java
diff --git a/core/src/test/java/com/softwaremill/jox/TestUtil.java b/channels/src/test/java/com/softwaremill/jox/TestUtil.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/TestUtil.java
rename to channels/src/test/java/com/softwaremill/jox/TestUtil.java
diff --git a/core/src/test/java/com/softwaremill/jox/TestWithCapacities.java b/channels/src/test/java/com/softwaremill/jox/TestWithCapacities.java
similarity index 100%
rename from core/src/test/java/com/softwaremill/jox/TestWithCapacities.java
rename to channels/src/test/java/com/softwaremill/jox/TestWithCapacities.java
diff --git a/pom.xml b/pom.xml
index a8d1d88..b0ceafd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     </properties>
 
     <modules>
-        <module>core</module>
+        <module>channels</module>
         <module>bench</module>
     </modules>