diff --git a/ChangeLog b/ChangeLog
index 4a4d4b2..1bbf881 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
     * Added LTE RRC example (Bi-Ruei, Chiu).
     * Added IEEE 1609.2 example.
     * Added SAE J2735 example.
+    * converter-sample.c renamed into converter-example.c
     * CVE-2017-12966 verified not present.
     * Fix incomplete (failed) CHOICE XER decoding memory leak.
       (Severity: medium; Security impact: medium)
diff --git a/doc/asn1c-usage.pdf b/doc/asn1c-usage.pdf
index bbfe7bb..a4d8251 100644
--- a/doc/asn1c-usage.pdf
+++ b/doc/asn1c-usage.pdf
Binary files differ
diff --git a/doc/docsrc/asn1c-usage.tex b/doc/docsrc/asn1c-usage.tex
index dda59ca..c1d5b73 100644
--- a/doc/docsrc/asn1c-usage.tex
+++ b/doc/docsrc/asn1c-usage.tex
@@ -203,15 +203,16 @@
 decoders and other useful routines. There will be quite a few of them, some
 of them are not even always necessary, but the overall amount of code
 after compilation will be rather small anyway.
-\item A \emph{converter-sample.c} file containing the \emph{int main()} function with a fully functioning decoder. It can convert a given PDU between BER, XER and possibly OER and PER (if -gen-OER or -gen-PER options to asn1c were in effect). At some point you will want to replace this file with your own file containing the \emph{int main()} function.
-\item A \emph{Makefile.am.sample} file mentioning all the files created
-at the earlier steps. This file is suitable for either automake suite
-or the plain `make` utility. Just rename it into \emph{Makefile}.
+\item A \emph{converter-example.c} file containing the \emph{int main()} function with a fully functioning decoder. It can convert a given PDU between BER, XER and possibly OER and PER (if -gen-OER or -gen-PER options to asn1c were in effect). At some point you will want to replace this file with your own file containing the \emph{int main()} function.
+\item A \emph{Makefile.am.libasncodecs} file mentioning all the files created
+at the earlier steps. The accompanying \emph{Makefile.am.example} file is
+suitable for either automake suite or the plain `make` utility.
+Just rename it into \emph{Makefile}.
 \end{itemize}
 It is possible to compile everything with just a couple of instructions:
 \begin{bash}
 asn1c -pdu=%\emph{Rectangle}% *.asn1
-make -f Makefile.am.sample                    # If you use `make`
+make -f Makefile.am.example                    # If you use `make`
 \end{bash}
 or
 \begin{bash}
@@ -220,7 +221,7 @@
 \end{bash}
 Refer to the Chapter \ref{cha:Step-by-step-examples} for a sample
 \emph{int main()} function if you want some custom logic and not satisfied
-with the supplied \emph{converter-sample.c}.
+with the supplied \emph{converter-example.c}.
 
 \clearpage{}
 \section{\label{sec:Command-line-options}Command line options}
diff --git a/tests/tests-c-compiler/check-assembly.sh b/tests/tests-c-compiler/check-assembly.sh
index fa31df0..de90b26 100755
--- a/tests/tests-c-compiler/check-assembly.sh
+++ b/tests/tests-c-compiler/check-assembly.sh
@@ -110,7 +110,7 @@
 		-S ${abs_top_srcdir}/skeletons	\\
 		-Wdebug-compiler		\\
 		${AFLAGS} ${asn_module}
-	rm -f converter-sample.c
+	rm -f converter-example.c
 	@touch compiled-module
 
 TARGETS