Update and rename d620.mk to d618.mk