fix for dynamic add, removing and renaming tc classes