better sink name and fix in parser/serializer for namespace