change mutt-naming to follow convention