Minor naming revisions.