renaming and morse fix