diff --git a/src/MAKE/MACHINES/Makefile.mkl b/src/MAKE/MACHINES/Makefile.mkl
deleted file mode 100644
index 88357aa722..0000000000
--- a/src/MAKE/MACHINES/Makefile.mkl
+++ /dev/null
@@ -1,119 +0,0 @@
-# mkl = Intel Cluster Tools, mpiicc, MKL MPI, MKL FFT
-
-# Intel recommends Intel Cluster Tools Compiler Edition
-# to build libfftw2xc_intel.a: 
-# > cd /opt/intel/mkl/10.0.011/interfaces/fftw2xc
-# > become root via su
-# > gmake libem64t
-
-SHELL = /bin/sh
-
-# ---------------------------------------------------------------------
-# compiler/linker settings
-# specify flags and libraries needed for your compiler
-
-CC =		mpiicc
-CCFLAGS =	-O3 -fno-alias -ip -unroll0
-SHFLAGS =	-fPIC
-DEPFLAGS =	-M
-
-LINK =		mpiicc
-LINKFLAGS =	-O -L/opt/intel/mkl/10.0.011/lib/em64t 
-LIB =           -lstdc++ -lpthread -lmkl_em64t -lguide 
-SIZE =		size
-
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SHLIBFLAGS =	-shared
-
-# ---------------------------------------------------------------------
-# LAMMPS-specific settings, all OPTIONAL
-# specify settings for LAMMPS features you will use
-# if you change any -D setting, do full re-compile after "make clean"
-
-# LAMMPS ifdef settings
-# see possible settings in Section 2.2 (step 4) of manual
-
-LMP_INC =	-DLAMMPS_GZIP
-
-# MPI library
-# see discussion in Section 2.2 (step 5) of manual
-# MPI wrapper compiler/linker can provide this info
-# can point to dummy MPI library in src/STUBS as in Makefile.serial
-# use -D MPICH and OMPI settings in INC to avoid C++ lib conflicts
-# INC = path for mpi.h, MPI compiler settings
-# PATH = path for MPI library
-# LIB = name of MPI library
-
-MPI_INC =       -DMPICH_SKIP_MPICXX 
-MPI_PATH = 
-MPI_LIB =	-mt_mpi
-
-# FFT library
-# see discussion in Section 2.2 (step 6) of manaul
-# can be left blank to use provided KISS FFT library
-# INC = -DFFT setting, e.g. -DFFT_FFTW, FFT compiler settings
-# PATH = path for FFT library
-# LIB = name of FFT library
-
-FFT_INC =       -DFFT_FFTW -I/opt/intel/mkl/10.0.011/include/fftw 
-FFT_PATH = 
-FFT_LIB =	/opt/intel/mkl/10.0.011/lib/em64t/libfftw2xc_intel.a
-
-# JPEG and/or PNG library
-# see discussion in Section 2.2 (step 7) of manual
-# only needed if -DLAMMPS_JPEG or -DLAMMPS_PNG listed with LMP_INC
-# INC = path(s) for jpeglib.h and/or png.h
-# PATH = path(s) for JPEG library and/or PNG library
-# LIB = name(s) of JPEG library and/or PNG library
-
-JPG_INC =       
-JPG_PATH = 	
-JPG_LIB =	
-
-# ---------------------------------------------------------------------
-# build rules and dependencies
-# do not edit this section
-
-include	Makefile.package.settings
-include	Makefile.package
-
-EXTRA_INC = $(LMP_INC) $(PKG_INC) $(MPI_INC) $(FFT_INC) $(JPG_INC) $(PKG_SYSINC)
-EXTRA_PATH = $(PKG_PATH) $(MPI_PATH) $(FFT_PATH) $(JPG_PATH) $(PKG_SYSPATH)
-EXTRA_LIB = $(PKG_LIB) $(MPI_LIB) $(FFT_LIB) $(JPG_LIB) $(PKG_SYSLIB)
-
-# Path to src files
-
-vpath %.cpp ..
-vpath %.h ..
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(EXTRA_PATH) $(OBJ) $(EXTRA_LIB) $(LIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library targets
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-shlib:	$(OBJ)
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(SHLIBFLAGS) $(EXTRA_PATH) -o $(EXE) \
-        $(OBJ) $(EXTRA_LIB) $(LIB)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(EXTRA_INC) $(DEPFLAGS) $< > $@
-
-%.o:%.cu
-	$(CC) $(CCFLAGS) $(SHFLAGS) $(EXTRA_INC) -c $<
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-sinclude $(DEPENDS)
diff --git a/src/MAKE/MACHINES/Makefile.odin b/src/MAKE/MACHINES/Makefile.myrinet
similarity index 98%
rename from src/MAKE/MACHINES/Makefile.odin
rename to src/MAKE/MACHINES/Makefile.myrinet
index 2190cd29e5..94c1322008 100755
--- a/src/MAKE/MACHINES/Makefile.odin
+++ b/src/MAKE/MACHINES/Makefile.myrinet
@@ -1,4 +1,4 @@
-# odin = 1400 cluster, g++, MPICH, no FFTs
+# myrinet = cluster, g++, myrinet MPI, no FFTs
 
 SHELL = /bin/sh
 
diff --git a/src/MAKE/MACHINES/Makefile.power5 b/src/MAKE/MACHINES/Makefile.power
similarity index 98%
rename from src/MAKE/MACHINES/Makefile.power5
rename to src/MAKE/MACHINES/Makefile.power
index fe023bcaa3..8199e762ba 100644
--- a/src/MAKE/MACHINES/Makefile.power5
+++ b/src/MAKE/MACHINES/Makefile.power
@@ -1,4 +1,4 @@
-# power5 = IBM Power5+, mpCC_r, native MPI, FFTW
+# power = IBM Power5+, mpCC_r, native MPI, FFTW
 
 SHELL = /bin/sh
 .SUFFIXES: .cpp .u