diff --git a/src/Machine.ts b/src/Producer.ts
similarity index 76%
rename from src/Machine.ts
rename to src/Producer.ts
index ad641b5..52581a0 100644
--- a/src/Machine.ts
+++ b/src/Producer.ts
@@ -1,6 +1,6 @@
 import {Observer} from './Observer';
 
-export interface Machine<T> {
+export interface Producer<T> {
   start: (observer: Observer<T>) => void;
   stop: () => void;
 }
diff --git a/src/Stream.ts b/src/Stream.ts
index bdbd843..0aabf04 100644
--- a/src/Stream.ts
+++ b/src/Stream.ts
@@ -1,18 +1,18 @@
 import {Observer} from './Observer';
-import {Machine} from './Machine';
-import {MapMachine} from './operator/MapMachine';
-import {FilterMachine} from './operator/FilterMachine';
-import {TakeMachine} from './operator/TakeMachine';
-import {SkipMachine} from './operator/SkipMachine';
-import {DebugMachine} from './operator/DebugMachine';
-import {FoldMachine} from './operator/FoldMachine';
-import {LastMachine} from './operator/LastMachine';
+import {Producer} from './Producer';
+import {MapProducer} from './operator/MapProducer';
+import {FilterProducer} from './operator/FilterProducer';
+import {TakeProducer} from './operator/TakeProducer';
+import {SkipProducer} from './operator/SkipProducer';
+import {DebugProducer} from './operator/DebugProducer';
+import {FoldProducer} from './operator/FoldProducer';
+import {LastProducer} from './operator/LastProducer';
 
 export class Stream<T> implements Observer<T> {
   public observers: Array<Observer<T>>;
   public num: number; // Number of non-operator subscribers
 
-  constructor(public machine: Machine<T>) {
+  constructor(public machine: Producer<T>) {
     this.observers = [];
     this.num = 0;
   }
@@ -64,30 +64,30 @@ export class Stream<T> implements Observer<T> {
   }
 
   map<U>(project: (t: T) => U): Stream<U> {
-    return new Stream<U>(new MapMachine(project, this));
+    return new Stream<U>(new MapProducer(project, this));
   }
 
   filter(predicate: (t: T) => boolean): Stream<T> {
-    return new Stream<T>(new FilterMachine(predicate, this));
+    return new Stream<T>(new FilterProducer(predicate, this));
   }
 
   take(amount: number): Stream<T> {
-    return new Stream<T>(new TakeMachine(amount, this));
+    return new Stream<T>(new TakeProducer(amount, this));
   }
 
   skip(amount: number): Stream<T> {
-    return new Stream<T>(new SkipMachine(amount, this));
+    return new Stream<T>(new SkipProducer(amount, this));
   }
 
   debug(spy: (t: T) => void = null): Stream<T> {
-    return new Stream<T>(new DebugMachine(spy, this));
+    return new Stream<T>(new DebugProducer(spy, this));
   }
 
   fold<R>(accumulate: (acc: R, t: T) => R, init: R): Stream<R> {
-    return new Stream<R>(new FoldMachine(accumulate, init, this));
+    return new Stream<R>(new FoldProducer(accumulate, init, this));
   }
 
   last(): Stream<T> {
-    return new Stream<T>(new LastMachine(this));
+    return new Stream<T>(new LastProducer(this));
   }
 }
diff --git a/src/factory/from.ts b/src/factory/from.ts
index 47b5954..029a7d3 100644
--- a/src/factory/from.ts
+++ b/src/factory/from.ts
@@ -1,9 +1,9 @@
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Observer} from '../Observer';
 import {Stream} from '../Stream';
 import {noop} from '../utils/noop';
 
-class FromMachine<T> implements Machine<T> {
+class FromProducer<T> implements Producer<T> {
   constructor(public array: Array<T>) {
   }
 
@@ -22,6 +22,6 @@ class FromMachine<T> implements Machine<T> {
 }
 
 export default function from<T>(array: Array<T>) {
-  const fromMachine = new FromMachine(array);
-  return new Stream<T>(fromMachine);
+  const fromProducer = new FromProducer(array);
+  return new Stream<T>(fromProducer);
 }
diff --git a/src/factory/interval.ts b/src/factory/interval.ts
index 9ef7ff2..aff307c 100644
--- a/src/factory/interval.ts
+++ b/src/factory/interval.ts
@@ -1,8 +1,8 @@
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Observer} from '../Observer';
 import {Stream} from '../Stream';
 
-class IntervalMachine implements Machine<number> {
+class IntervalProducer implements Producer<number> {
   on: boolean;
   intervalID: any;
   i: number;
@@ -25,6 +25,6 @@ class IntervalMachine implements Machine<number> {
 }
 
 export default function interval(period: number) {
-  const intervalMachine = new IntervalMachine(period);
-  return new Stream<number>(intervalMachine);
+  const intervalProducer = new IntervalProducer(period);
+  return new Stream<number>(intervalProducer);
 }
diff --git a/src/operator/DebugMachine.ts b/src/operator/DebugProducer.ts
similarity index 87%
rename from src/operator/DebugMachine.ts
rename to src/operator/DebugProducer.ts
index 7d451a7..d66cf65 100644
--- a/src/operator/DebugMachine.ts
+++ b/src/operator/DebugProducer.ts
@@ -1,9 +1,9 @@
 import {Observer} from '../Observer';
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Stream} from '../Stream';
 import {emptyObserver} from '../utils/emptyObserver';
 
-export class DebugMachine<T> implements Machine<T> {
+export class DebugProducer<T> implements Producer<T> {
   public proxy: Observer<T> = emptyObserver;
 
   constructor(public spy: (t: T) => void = null,
diff --git a/src/operator/FilterMachine.ts b/src/operator/FilterProducer.ts
similarity index 77%
rename from src/operator/FilterMachine.ts
rename to src/operator/FilterProducer.ts
index 0ba8047..3e3d4ca 100644
--- a/src/operator/FilterMachine.ts
+++ b/src/operator/FilterProducer.ts
@@ -1,15 +1,15 @@
 import {Observer} from '../Observer';
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Stream} from '../Stream';
 import {emptyObserver} from '../utils/emptyObserver';
 
 export class Proxy<T> implements Observer<T> {
   constructor(public out: Stream<T>,
-              public machine: FilterMachine<T>) {
+              public p: FilterProducer<T>) {
   }
 
   next(t: T) {
-    if (this.machine.predicate(t)) this.out.next(t);
+    if (this.p.predicate(t)) this.out.next(t);
   }
 
   error(err: any) {
@@ -21,7 +21,7 @@ export class Proxy<T> implements Observer<T> {
   }
 }
 
-export class FilterMachine<T> implements Machine<T> {
+export class FilterProducer<T> implements Producer<T> {
   public proxy: Observer<T> = emptyObserver;
 
   constructor(public predicate: (t: T) => boolean,
diff --git a/src/operator/FoldMachine.ts b/src/operator/FoldProducer.ts
similarity index 78%
rename from src/operator/FoldMachine.ts
rename to src/operator/FoldProducer.ts
index e8fa517..efea7e9 100644
--- a/src/operator/FoldMachine.ts
+++ b/src/operator/FoldProducer.ts
@@ -1,16 +1,16 @@
 import {Observer} from '../Observer';
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Stream} from '../Stream';
 import {emptyObserver} from '../utils/emptyObserver';
 
 export class Proxy<T, R> implements Observer<T> {
   constructor(public out: Stream<R>,
-              public m: FoldMachine<T, R>) {
+              public p: FoldProducer<T, R>) {
   }
 
   next(t: T) {
-    const m = this.m;
-    this.out.next(m.acc = m.a(m.acc, t));
+    const p = this.p;
+    this.out.next(p.acc = p.a(p.acc, t));
   }
 
   error(err: any) {
@@ -22,7 +22,7 @@ export class Proxy<T, R> implements Observer<T> {
   }
 }
 
-export class FoldMachine<T, R> implements Machine<R> {
+export class FoldProducer<T, R> implements Producer<R> {
   public proxy: Observer<T> = emptyObserver;
   public acc: R;
 
diff --git a/src/operator/LastMachine.ts b/src/operator/LastProducer.ts
similarity index 73%
rename from src/operator/LastMachine.ts
rename to src/operator/LastProducer.ts
index 9fd9b7e..e3de0e8 100644
--- a/src/operator/LastMachine.ts
+++ b/src/operator/LastProducer.ts
@@ -1,17 +1,17 @@
 import {Observer} from '../Observer';
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Stream} from '../Stream';
 import {emptyObserver} from '../utils/emptyObserver';
 
 export class Proxy<T> implements Observer<T> {
   constructor(public out: Stream<T>,
-              public machine: LastMachine<T>) {
+              public p: LastProducer<T>) {
   }
 
   next(t: T) {
-    const m = this.machine;
-    m.has = true;
-    m.val = t;
+    const p = this.p;
+    p.has = true;
+    p.val = t;
   }
 
   error(err: any) {
@@ -19,10 +19,10 @@ export class Proxy<T> implements Observer<T> {
   }
 
   complete() {
-    const m = this.machine;
+    const p = this.p;
     const out = this.out;
-    if (m.has) {
-      out.next(m.val);
+    if (p.has) {
+      out.next(p.val);
       out.complete();
     } else {
       out.error('TODO show proper error');
@@ -30,7 +30,7 @@ export class Proxy<T> implements Observer<T> {
   }
 }
 
-export class LastMachine<T> implements Machine<T> {
+export class LastProducer<T> implements Producer<T> {
   public proxy: Observer<T> = emptyObserver;
   public has: boolean = false;
   public val: T = <T> {};
diff --git a/src/operator/MapMachine.ts b/src/operator/MapProducer.ts
similarity index 77%
rename from src/operator/MapMachine.ts
rename to src/operator/MapProducer.ts
index ff6304a..ad89974 100644
--- a/src/operator/MapMachine.ts
+++ b/src/operator/MapProducer.ts
@@ -1,15 +1,15 @@
 import {Observer} from '../Observer';
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Stream} from '../Stream';
 import {emptyObserver} from '../utils/emptyObserver';
 
 export class Proxy<T, U> implements Observer<T> {
   constructor(public out: Stream<U>,
-              public machine: MapMachine<T, U>) {
+              public p: MapProducer<T, U>) {
   }
 
   next(t: T) {
-    this.out.next(this.machine.project(t));
+    this.out.next(this.p.project(t));
   }
 
   error(err: any) {
@@ -21,7 +21,7 @@ export class Proxy<T, U> implements Observer<T> {
   }
 }
 
-export class MapMachine<T, U> implements Machine<U> {
+export class MapProducer<T, U> implements Producer<U> {
   public proxy: Observer<T> = emptyObserver;
 
   constructor(public project: (t: T) => U,
diff --git a/src/operator/SkipMachine.ts b/src/operator/SkipProducer.ts
similarity index 86%
rename from src/operator/SkipMachine.ts
rename to src/operator/SkipProducer.ts
index d804b8c..63898c9 100644
--- a/src/operator/SkipMachine.ts
+++ b/src/operator/SkipProducer.ts
@@ -1,9 +1,9 @@
 import {Observer} from '../Observer';
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Stream} from '../Stream';
 import {emptyObserver} from '../utils/emptyObserver';
 
-export class SkipMachine<T> implements Machine<T> {
+export class SkipProducer<T> implements Producer<T> {
   public proxy: Observer<T> = emptyObserver;
   public skipped: number = 0;
 
diff --git a/src/operator/TakeMachine.ts b/src/operator/TakeProducer.ts
similarity index 88%
rename from src/operator/TakeMachine.ts
rename to src/operator/TakeProducer.ts
index b33198f..af13eed 100644
--- a/src/operator/TakeMachine.ts
+++ b/src/operator/TakeProducer.ts
@@ -1,9 +1,9 @@
 import {Observer} from '../Observer';
-import {Machine} from '../Machine';
+import {Producer} from '../Producer';
 import {Stream} from '../Stream';
 import {emptyObserver} from '../utils/emptyObserver';
 
-export class TakeMachine<T> implements Machine<T> {
+export class TakeProducer<T> implements Producer<T> {
   public proxy: Observer<T> = emptyObserver;
   public taken: number = 0;