Rename "SetupActor" message to be more informatively named. Cleanup a few things.