diff --git a/dfn/dev.tex b/dfn/dev.tex
index be08f86..ea90d54 100644
--- a/dfn/dev.tex
+++ b/dfn/dev.tex
@@ -2,7 +2,7 @@
 %
 % Intended to be included within its own section.
 
-Definitions within this subsection are used most frequently by the Software
+Definitions within this subsection are used most frequently by the software
 developers addressed by this specification.
 
 \begin{description}
@@ -119,10 +119,6 @@ developers addressed by this specification.
   Non-local data that is altered as a consequence of applying a function or
   calling a procedure.
 
-  \dt{Software}
-  The result of implementing, through the use of machine code or a programming
-  language, this specification.
-
   \dt{string}
   A finite sequence of symbols---often bytes. When used on its own,
   traditionally implies a ``character string''---that is, a string of character
diff --git a/dfn/spec.tex b/dfn/spec.tex
index 38180c6..a2fd34a 100644
--- a/dfn/spec.tex
+++ b/dfn/spec.tex
@@ -19,7 +19,8 @@ specification to resolve implementation issues and should exercise that ability.
   Alternatively, the adverb ``optionally''; denotes a requirement whose
   implementation is not required and may be omitted; such \shall be used only to
   provide flexibility for implementors to exercise their best judgment or to
-  denote requirements that are not essential to the operation of the Software.
+  denote requirements that are not essential to the operation of the
+  implementation.
 
   \dt{Undefined}
   The error condition results in behavior that is not defined by a particular
@@ -29,7 +30,7 @@ specification to resolve implementation issues and should exercise that ability.
 
   \dt{Unspecified}
   The behavior is not determined by this specification or is inconsequential to
-  the Software's operation.
+  the implementation's operation.
 
   \dt{Deprecated}
   When used within context of this specification: the feature or requirement
@@ -42,4 +43,10 @@ specification to resolve implementation issues and should exercise that ability.
   \dt{Removed}
   A feature or requirement mentioned in an earlier revision of this
   specification has been removed and will not be superseded.
+
+  \dt{implementation}
+  Software that implements this specification.
+
+  \dt{conforming implementation}
+  A software implementation that strictly conforms to this specification.
 \end{description}