diff --git a/mpn/generic/mullow_n_basecase.c b/mpn/generic/mullow_n_basecase.c
index 5bb4bdd4..db6b50f3 100644
--- a/mpn/generic/mullow_n_basecase.c
+++ b/mpn/generic/mullow_n_basecase.c
@@ -1,5 +1,5 @@
 /* mpn_mullow_n_basecase -- Internal routine to multiply two natural
-   numbers of length m and n and return the low part.
+   numbers of length n and return the low part.
 
    THIS IS AN INTERNAL FUNCTION WITH A MUTABLE INTERFACE.  IT IS ONLY
    SAFE TO REACH THIS FUNCTION THROUGH DOCUMENTED INTERFACES.
@@ -11,7 +11,7 @@ This file is part of the GNU MP Library.
 
 The GNU MP Library is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at your
+the Free Software Foundation; either version 3 of the License, or (at your
 option) any later version.
 
 The GNU MP Library is distributed in the hope that it will be useful, but
@@ -20,11 +20,9 @@ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA 02110-1301, USA. */
+along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#include "mpir.h"
+#include "gmp.h"
 #include "gmp-impl.h"
 
 /*
diff --git a/mpn/x86_64/mullow_basecase.asm b/mpn/x86_64/mullow_n_basecase.asm
similarity index 99%
rename from mpn/x86_64/mullow_basecase.asm
rename to mpn/x86_64/mullow_n_basecase.asm
index 6b4b0dad..e3fb914d 100644
--- a/mpn/x86_64/mullow_basecase.asm
+++ b/mpn/x86_64/mullow_n_basecase.asm
@@ -1,4 +1,4 @@
-dnl  AMD64 mpn_mullow_basecase.
+dnl  AMD64 mpn_mullow_n_basecase.
 
 dnl  Contributed to the GNU project by Torbjorn Granlund.
 
@@ -56,7 +56,7 @@ define(`w3',	`%r10')
 ASM_START()
 	TEXT
 	ALIGN(16)
-PROLOGUE(mpn_mullow_basecase)
+PROLOGUE(mpn_mullow_n_basecase)
 	
 	cmp	$4, n
 	jge	L(gen)