Fix '-server' suffix mess