From 21cf2319d5ac0e6f24733b7562ba250e1c638f5e Mon Sep 17 00:00:00 2001
From: Michael Zhu <mchl.zhu.96@gmail.com>
Date: Thu, 17 Oct 2019 20:02:15 -0700
Subject: [PATCH] rename some stuff

---
 contracts/integrations/test/actors/base.ts          | 2 +-
 contracts/integrations/test/actors/hybrids.ts       | 6 +++---
 contracts/integrations/test/actors/index.ts         | 4 ++--
 contracts/integrations/test/actors/maker.ts         | 4 ++--
 contracts/integrations/test/actors/pool_operator.ts | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contracts/integrations/test/actors/base.ts b/contracts/integrations/test/actors/base.ts
index d3933fbd33..c3638c817d 100644
--- a/contracts/integrations/test/actors/base.ts
+++ b/contracts/integrations/test/actors/base.ts
@@ -10,7 +10,7 @@ export interface ActorConfig {
     address: string;
     name?: string;
     deployment: DeploymentManager;
-    [subclassProperty: string]: any;
+    [mixinProperty: string]: any;
 }
 
 export class Actor {
diff --git a/contracts/integrations/test/actors/hybrids.ts b/contracts/integrations/test/actors/hybrids.ts
index 221b9243d6..72e6c835e7 100644
--- a/contracts/integrations/test/actors/hybrids.ts
+++ b/contracts/integrations/test/actors/hybrids.ts
@@ -1,5 +1,5 @@
 import { Actor } from './base';
-import { Maker } from './maker';
-import { PoolOperator } from './pool_operator';
+import { MakerMixin } from './maker';
+import { PoolOperatorMixin } from './pool_operator';
 
-export const OperatorAndMaker = PoolOperator(Maker(Actor));
+export const OperatorMaker = PoolOperatorMixin(MakerMixin(Actor));
diff --git a/contracts/integrations/test/actors/index.ts b/contracts/integrations/test/actors/index.ts
index af721ca484..ab525a5a70 100644
--- a/contracts/integrations/test/actors/index.ts
+++ b/contracts/integrations/test/actors/index.ts
@@ -1,3 +1,3 @@
-export { MakerActor } from './maker';
-export { PoolOperatorActor } from './pool_operator';
+export { Maker } from './maker';
+export { PoolOperator } from './pool_operator';
 export * from './hybrids';
diff --git a/contracts/integrations/test/actors/maker.ts b/contracts/integrations/test/actors/maker.ts
index 636cab585e..6fd21e43ec 100644
--- a/contracts/integrations/test/actors/maker.ts
+++ b/contracts/integrations/test/actors/maker.ts
@@ -8,7 +8,7 @@ export interface MakerConfig extends ActorConfig {
     orderConfig: Partial<Order>;
 }
 
-export function Maker<TBase extends Constructor>(Base: TBase) {
+export function MakerMixin<TBase extends Constructor>(Base: TBase) {
     return class extends Base {
         public readonly actor: Actor;
         public readonly orderFactory: OrderFactory;
@@ -49,4 +49,4 @@ export function Maker<TBase extends Constructor>(Base: TBase) {
     };
 }
 
-export const MakerActor = Maker(Actor);
+export const Maker = MakerMixin(Actor);
diff --git a/contracts/integrations/test/actors/pool_operator.ts b/contracts/integrations/test/actors/pool_operator.ts
index d2611ff4a4..beaaf30ee4 100644
--- a/contracts/integrations/test/actors/pool_operator.ts
+++ b/contracts/integrations/test/actors/pool_operator.ts
@@ -6,7 +6,7 @@ export interface PoolOperatorConfig extends ActorConfig {
     operatorShare: number;
 }
 
-export function PoolOperator<TBase extends Constructor>(Base: TBase) {
+export function PoolOperatorMixin<TBase extends Constructor>(Base: TBase) {
     return class extends Base {
         public readonly operatorShare: number;
         public readonly poolIds: string[] = [];
@@ -57,4 +57,4 @@ export function PoolOperator<TBase extends Constructor>(Base: TBase) {
     };
 }
 
-export const PoolOperatorActor = PoolOperator(Actor);
+export const PoolOperator = PoolOperatorMixin(Actor);