Yes, when ever the single, generic term is used it means water baptism. St. Thomas Aquinas defined baptism as; "Baptism is the external ablution of the body" It is the default meaning.
When ever Scripture refers to any other kind of symbolic baptism it always uses a qualifier.
So water is the only way for that to happen?