The little boy swims under the water.
The little male is surrounded by water.
It may be important for the management centralization in the agencies to determine if lack of standardization is really an issue.