It doesn't make much sense to have the developer(s)/publisher(s) noted for every piece of software; use software name only.
XHTML provides strict parsing checks to enforce XML compliance, unlike HTML which will allow broken code to load. Code-correctness will substantially increase with this change.