Cleaned up treeview names