(cleanup) Rename ServerT to Server