Updated server to allow for name changes