You are right on in your clarification. Hopefully this will help eliminate the high amount of rivers that NHD has. While there may be a few rivers that have stream in the name, these will be few. Feel free to add these additional rules to the main NHD page. While the Python script will handle the additional qualifier of the name, the Java converter will not. As a result, people we need to use filters to select both options to make the change before uploading.