Revert "Rename server -> master"

This reverts commit a8464de3b0f7bcba1b873122de1a90065b8e9c84.