Several fixes regarding renaming

please align again hash