WIP Rename user as owner

Fixes #1