made name changes per rcrowley's request.