FIX: taskName -> requestName for consistency

FIX: __requestName -> _requestName
Streamline some spaghetti code