fix "expansion 1": rename, etc