Rename user to actor and other small refactorings