Switched over all instances of motor

Signed-off-by: Mike Lewis <mikelewis@alphalem.com>