Some changes, renaming not working
Category renaming working