Revisions due to naming confusion.