Added 'rename' to component context menu

Many other changes (mostly object names) to make code clearer.