Cleaned up nomenclature inside Server classes.