[client] Sanitize coding style/conventions in GUI classes

44 files changed, 544 insertions, 554 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
index a1d3b6ea..d2139b2f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
@@ -12,9 +12,6 @@ import org.openslx.dozmod.util.FormatHelper;
 import org.openslx.dozmod.util.OpenLinks;
 import org.openslx.dozmod.util.OpenLinks.Link;
 
-/**
- * Window for showing the disclaimer.
- */
 @SuppressWarnings("serial")
 public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeedback, ActionListener {
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 7854dee9..b17de3c8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -109,9 +109,9 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	/**
 	 * Popup menu items
 	 */
-	private JMenuItem popupItemNewLecture = new JMenuItem("Neue Veranstaltung");
-	private JMenuItem popupItemDownload = new JMenuItem("Download");
-	private JMenuItem popupItemDelete = new JMenuItem("Löschen");
+	private final JMenuItem mnuNewLecture = new JMenuItem("Neue Veranstaltung");
+	private final JMenuItem mnuDownload = new JMenuItem("Download");
+	private final JMenuItem mnuDelete = new JMenuItem("Löschen");
 
 	private boolean metadataChanged = false;
 	private boolean permissionsChanged = false;
@@ -198,43 +198,43 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 			}
 		});
 
-		versionTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+		tblVersions.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
 		/**
 		 * Popup menu for the version table on the right side
 		 */
 		final PopupMenu pop = new PopupMenu(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				ImageVersionDetails selected = versionTable.getSelectedItem();
+				ImageVersionDetails selected = tblVersions.getSelectedItem();
 				if (selected == null)
 					return;
-				if (e.getSource().equals(popupItemNewLecture)) {
+				if (e.getSource().equals(mnuNewLecture)) {
 					ImageSummaryRead summary = new ImageSummaryRead();
 					summary.setImageName(image.getImageName()); // Maybe create a helper class/function some day that transforms all fields
 					new LectureWizard(me, summary, selected.getVersionId()).setVisible(true);
 				}
-				if (e.getSource().equals(popupItemDownload)) {
+				if (e.getSource().equals(mnuDownload)) {
 					performImageDownload(selected);
 				}
-				if (e.getSource().equals(popupItemDelete)) {
-					deleteVersions(versionTable.getSelectedItems());
+				if (e.getSource().equals(mnuDelete)) {
+					deleteVersions(tblVersions.getSelectedItems());
 				}
 
 			}
 		});
-		pop.addMenuItem(popupItemNewLecture);
-		pop.addMenuItem(popupItemDownload);
+		pop.addMenuItem(mnuNewLecture);
+		pop.addMenuItem(mnuDownload);
 		pop.addSeparator();
-		pop.addMenuItem(popupItemDelete);
+		pop.addMenuItem(mnuDelete);
 
 		// keyboard shortcut
-		versionTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+		tblVersions.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
 				KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
-		versionTable.getActionMap().put("delete", new AbstractAction() {
+		tblVersions.getActionMap().put("delete", new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent ae) {
 				if (ImagePerms.canEdit(image)) {
-					deleteVersions(versionTable.getSelectedItems());
+					deleteVersions(tblVersions.getSelectedItems());
 				}
 			}
 		});
@@ -255,30 +255,30 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 
 			private void processClick(MouseEvent e) {
 				// rowIndex at mouse cursor
-				int mouseRowIndex = versionTable.rowAtPoint(e.getPoint());
+				int mouseRowIndex = tblVersions.rowAtPoint(e.getPoint());
 
 				// is the click event on an already selected row?
 				boolean alreadySelectedRow = false;
-				for (int i : versionTable.getSelectedRows()) {
+				for (int i : tblVersions.getSelectedRows()) {
 					if (i == mouseRowIndex) {
 						alreadySelectedRow = true;
 						break;
 					}
 				}
 
-				if (mouseRowIndex >= 0 && mouseRowIndex < versionTable.getRowCount()
+				if (mouseRowIndex >= 0 && mouseRowIndex < tblVersions.getRowCount()
 						&& SwingUtilities.isRightMouseButton(e)) {
 					// select row if it wasn't in selection before
 					if (!alreadySelectedRow) {
-						versionTable.setRowSelectionInterval(mouseRowIndex, mouseRowIndex);
+						tblVersions.setRowSelectionInterval(mouseRowIndex, mouseRowIndex);
 					}
 					if (e.isPopupTrigger()) {
-						boolean multiSelection = versionTable.getSelectedRowCount() != 1;
-						popupItemNewLecture.setEnabled(versionTable.getSelectedItem().isValid
+						boolean multiSelection = tblVersions.getSelectedRowCount() != 1;
+						mnuNewLecture.setEnabled(tblVersions.getSelectedItem().isValid
 								&& ImagePerms.canLink(image) && !multiSelection);
-						popupItemDownload.setEnabled(versionTable.getSelectedItem().isValid
+						mnuDownload.setEnabled(tblVersions.getSelectedItem().isValid
 								&& ImagePerms.canDownload(image) && !multiSelection);
-						popupItemDelete.setEnabled(versionTable.getSelectedItem().isValid
+						mnuDelete.setEnabled(tblVersions.getSelectedItem().isValid
 								&& ImagePerms.canEdit(image));
 						pop.show(e.getComponent(), e.getX(), e.getY());
 					}
@@ -286,8 +286,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 
 			}
 		};
-		versionTableScrollPane.addMouseListener(ma);
-		versionTable.addMouseListener(ma);
+		scpVersions.addMouseListener(ma);
+		tblVersions.addMouseListener(ma);
 
 		// listen to changes
 		final TextChangeListener docListener = new TextChangeListener() {
@@ -594,15 +594,15 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 			if (lecture.imageBaseId.equals(image.imageBaseId))
 				lectureCount++;
 		}
-		linkedLectureCount.setText(Integer.toString(lectureCount));
-		linkedLectureCount.setForeground(lectureCount > 0 ? null : Color.RED);
+		lblLinkedLectureCount.setText(Integer.toString(lectureCount));
+		lblLinkedLectureCount.setForeground(lectureCount > 0 ? null : Color.RED);
 		btnShowLinkingLectures.setEnabled(lectureCount > 0);
 		
 		// set the versions of the image to the table
-		versionTable.setData(image.getVersions(), true);
-		popupItemDelete.setEnabled(ImagePerms.canAdmin(image));
-		popupItemDownload.setEnabled(ImagePerms.canDownload(image));
-		popupItemNewLecture.setEnabled(ImagePerms.canAdmin(image));
+		tblVersions.setData(image.getVersions(), true);
+		mnuDelete.setEnabled(ImagePerms.canAdmin(image));
+		mnuDownload.setEnabled(ImagePerms.canDownload(image));
+		mnuNewLecture.setEnabled(ImagePerms.canAdmin(image));
 		// make fields editable is allowed
 		makeEditable(true);
 		// finally do show it all
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
index f4dafda2..3b8011a2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
@@ -55,7 +55,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 	/**
 	 * The image table held by the ImageListViewer
 	 */
-	public final ImageTable imageTable = imageListViewer.getImageTable();
+	public final ImageTable imageTable = ctlImageListViewer.getImageTable();
 
 	/**
 	 * Popup menu items
@@ -115,7 +115,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 			@Override
 			public void keyReleased(KeyEvent e) {
 				if (e.getKeyCode() == KeyEvent.VK_F5) {
-					imageListViewer.refreshList(true, 1);
+					ctlImageListViewer.refreshList(true, 1);
 				}
 			}
 		});
@@ -168,38 +168,38 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 		/**
 		 * Bottom button panel listeners
 		 */
-		newButton.addActionListener(new ActionListener() {
+		btnNewVm.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				new ImageCreationWizard(SwingUtilities.getWindowAncestor(me)).setVisible(true);
-				imageListViewer.refreshList(true, 100);
+				ctlImageListViewer.refreshList(true, 100);
 			}
 		});
-		newLectureButton.addActionListener(new ActionListener() {
+		btnNewLecture.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				startLectureWizard(imageTable.getSelectedItem());
 			}
 		});
-		editButton.addActionListener(new ActionListener() {
+		btnEditDetails.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				openImageDetails(imageTable.getSelectedItem());
 			}
 		});
-		downloadButton.addActionListener(new ActionListener() {
+		btnDownload.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				performImageDownload(imageTable.getSelectedItem());
 			}
 		});
-		deleteButton.addActionListener(new ActionListener() {
+		btnDelete.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				deleteImages(imageTable.getSelectedItems());
 			}
 		});
-		switchViewButton.addActionListener(new ActionListener() {
+		btnSwitchView.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				MainWindow.showPage(LectureListWindow.class);
@@ -212,7 +212,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 		imageTable.getActionMap().put("details", new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent ae) {
-				editButton.doClick();
+				btnEditDetails.doClick();
 			}
 		});
 		imageTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
@@ -220,7 +220,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 		imageTable.getActionMap().put("delete", new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent ae) {
-				deleteButton.doClick();
+				btnDelete.doClick();
 			}
 		});
 
@@ -262,18 +262,18 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 		boolean download = isValid && ImagePerms.canDownload(item);
 		boolean link = isValid && ImagePerms.canLink(item);
 		boolean admin = ImagePerms.canAdmin(item);
-		downloadButton.setEnabled(download && singleSelection);
-		newLectureButton.setEnabled(link && singleSelection);
-		deleteButton.setEnabled(admin || !singleSelection);
+		btnDownload.setEnabled(download && singleSelection);
+		btnNewLecture.setEnabled(link && singleSelection);
+		btnDelete.setEnabled(admin || !singleSelection);
 		popupItemDownload.setEnabled(download && singleSelection);
 		popupItemNewLecture.setEnabled(link && singleSelection);
 		popupItemDelete.setEnabled(admin || !singleSelection);
-		editButton.setEnabled(singleSelection);
+		btnEditDetails.setEnabled(singleSelection);
 
 	}
 
 	public void refresh(boolean force) {
-		imageListViewer.refreshList(force, 1);
+		ctlImageListViewer.refreshList(force, 1);
 	}
 
 	/********************************************************************************
@@ -304,7 +304,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 		ImageDetailsWindow.open((JFrame) SwingUtilities.getWindowAncestor(me), image.getImageBaseId(),
 				new ImageUpdatedCallback() {
 					public void updated() {
-						imageListViewer.refreshList(true, 100);
+						ctlImageListViewer.refreshList(true, 100);
 					}
 				});
 	}
@@ -317,7 +317,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 	private void performImageDownload(ImageSummaryRead image) {
 		if (!hasLatestVersion(image))
 			return;
-		downloadButton.setEnabled(false);
+		btnDownload.setEnabled(false);
 		ThriftActions.initDownload(JOptionPane.getFrameForComponent(this), image.latestVersionId,
 				image.imageName, image.virtId, image.osId, image.fileSize, this);
 	}
@@ -333,8 +333,8 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 			Gui.asyncExec(new Runnable() {
 				@Override
 				public void run() {
-					downloadButton.setEnabled(true);
-					imageListViewer.refreshList(true, 1000);
+					btnDownload.setEnabled(true);
+					ctlImageListViewer.refreshList(true, 1000);
 				}
 			});
 		}
@@ -374,7 +374,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 			Gui.showMessageBox("Folgende images konnten nicht gelöscht werden: " + builder.toString(),
 					MessageType.INFO, LOGGER, null);
 		}
-		imageListViewer.refreshList(deletedAtLeastOne, 1000);
+		ctlImageListViewer.refreshList(deletedAtLeastOne, 1000);
 		QuickTimer.scheduleOnce(new Task() {
 
 			@Override
@@ -392,7 +392,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 	 */
 	@Override
 	public void isDeleted(boolean success) {
-		imageListViewer.refreshList(success, 1000);
+		ctlImageListViewer.refreshList(success, 1000);
 	}
 
 	/********************************************************************************
@@ -407,7 +407,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 
 	@Override
 	public void requestShow() {
-		imageListViewer.refreshList(false, 1);
+		ctlImageListViewer.refreshList(false, 1);
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
index ce5e532f..37ed88f5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
@@ -260,13 +260,13 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		chkIsExam.addActionListener(actionListener);
 		chkHasInternetAccess.addActionListener(actionListener);
 		chkIsActive.addActionListener(actionListener);
-		startDate.addActionListener(actionListener);
-		endDate.addActionListener(actionListener);
-		startTime.addChangeListener(changeListener);
-		endTime.addChangeListener(changeListener);
+		dtpStartDate.addActionListener(actionListener);
+		dtpEndDate.addActionListener(actionListener);
+		spnStartTime.addChangeListener(changeListener);
+		spnEndTime.addChangeListener(changeListener);
 
 		// save default color of date/time stuff to reset the background later
-		dateTimeTextColor = startDate.getForeground();
+		dateTimeTextColor = dtpStartDate.getForeground();
 		// disable save button
 		btnSaveChanges.setEnabled(false);
 		// wait for the image to be loaded before (potentially) enabling fields
@@ -354,15 +354,15 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 
 		Calendar startCal = Calendar.getInstance();
 		startCal.setTime(new Date(lecture.getStartTime() * 1000l));
-		startDate.getModel().setDate(startCal.get(Calendar.YEAR), startCal.get(Calendar.MONTH),
+		dtpStartDate.getModel().setDate(startCal.get(Calendar.YEAR), startCal.get(Calendar.MONTH),
 				startCal.get(Calendar.DATE));
-		startTime.getModel().setValue(startCal.getTime());
+		spnStartTime.getModel().setValue(startCal.getTime());
 
 		Calendar endCal = Calendar.getInstance();
 		endCal.setTime(new Date(lecture.getEndTime() * 1000l));
-		endDate.getModel().setDate(endCal.get(Calendar.YEAR), endCal.get(Calendar.MONTH),
+		dtpEndDate.getModel().setDate(endCal.get(Calendar.YEAR), endCal.get(Calendar.MONTH),
 				endCal.get(Calendar.DATE));
-		endTime.getModel().setValue(endCal.getTime());
+		spnEndTime.getModel().setValue(endCal.getTime());
 
 		makeEditable(true);
 		setVisible(true);
@@ -486,8 +486,8 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 			// first build the LectureWrite from the GUI fields
 			final LectureWrite metadata = new LectureWrite(txtTitle.getText(), txtDescription.getText(),
 					lecture.getImageVersionId(), chkAutoUpdate.isSelected(), chkIsActive.isSelected(),
-					DateTimeHelper.getDateFrom(startDate, startTime).getTime() / 1000L,
-					DateTimeHelper.getDateFrom(endDate, endTime).getTime() / 1000L, null, null,
+					DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime).getTime() / 1000L,
+					DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime).getTime() / 1000L, null, null,
 					chkIsExam.isSelected(), chkHasInternetAccess.isSelected(),
 					lecture.getDefaultPermissions(), locationInfo.locationList, locationInfo.limitToLocations, false); // TODO: Location related
 			// now trigger the actual action 
@@ -534,20 +534,20 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 			return false;
 		// analyse time stuff to see if its valid
 		if (start.after(end)) {
-			startDate.setForeground(Color.red);
+			dtpStartDate.setForeground(Color.red);
 			if (feedback)
 				Gui.showMessageBox(me, "Start der Veranstaltung ist nach dem Enddatum!", MessageType.ERROR,
 						LOGGER, null);
 		} else {
-			startDate.setForeground(dateTimeTextColor);
+			dtpStartDate.setForeground(dateTimeTextColor);
 			final Date now = new Date();
 			if (now.after(end)) {
 				if (feedback)
 					Gui.showMessageBox(me, "Enddatum liegt in der Vergangenheit!", MessageType.ERROR, LOGGER,
 							null);
-				endDate.setForeground(Color.red);
+				dtpEndDate.setForeground(Color.red);
 			} else {
-				endDate.setForeground(dateTimeTextColor);
+				dtpEndDate.setForeground(dateTimeTextColor);
 				return true;
 			}
 		}
@@ -560,8 +560,8 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 	 * @return true if it has changed, false otherwise
 	 */
 	private boolean dateHasChanged() {
-		return (DateTimeHelper.getDateFrom(startDate, startTime).getTime() / 1000L) != lecture.getStartTime()
-				|| (DateTimeHelper.getDateFrom(endDate, endTime).getTime() / 1000L) != lecture.getEndTime();
+		return (DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime).getTime() / 1000L) != lecture.getStartTime()
+				|| (DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime).getTime() / 1000L) != lecture.getEndTime();
 	}
 
 	/**
@@ -600,8 +600,8 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 			return false;
 		}
 		// Date stuff
-		Date start = DateTimeHelper.getDateFrom(startDate, startTime);
-		Date end = DateTimeHelper.getDateFrom(endDate, endTime);
+		Date start = DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime);
+		Date end = DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime);
 		if (!isPeriodValid(start, end, false) && dateHasChanged()) {
 			lblError.setText("Ungültiger Zeitraum!");
 			return false;
@@ -614,8 +614,8 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		changed = !txtTitle.getText().equals(lecture.getLectureName())
 				|| !txtDescription.getText().equals(lecture.getDescription())
 				|| !currentVersion.getVersionId().equals(lecture.getImageVersionId())
-				|| (DateTimeHelper.getDateFrom(startDate, startTime).getTime() / 1000L) != lecture.getStartTime()
-				|| (DateTimeHelper.getDateFrom(endDate, endTime).getTime() / 1000L) != lecture.getEndTime()
+				|| (DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime).getTime() / 1000L) != lecture.getStartTime()
+				|| (DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime).getTime() / 1000L) != lecture.getEndTime()
 				|| chkAutoUpdate.isSelected() != lecture.autoUpdate
 				|| chkIsExam.isSelected() != lecture.isExam
 				|| chkHasInternetAccess.isSelected() != lecture.hasInternetAccess
@@ -652,10 +652,10 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		cboVersions.setEnabled(editable && !lecture.autoUpdate && image != null);
 		btnChangeOwner.setEnabled(editable && LecturePerms.canAdmin(lecture));
 		btnPermissions.setEnabled(editable && LecturePerms.canAdmin(lecture));
-		startDate.setEnabled(editable);
-		startTime.setEnabled(editable);
-		endDate.setEnabled(editable);
-		endTime.setEnabled(editable);
+		dtpStartDate.setEnabled(editable);
+		spnStartTime.setEnabled(editable);
+		dtpEndDate.setEnabled(editable);
+		spnEndTime.setEnabled(editable);
 		btnDownloadImage.setEnabled(ImagePerms.canDownload(image));
 	}
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
index faa3d98d..0beb3b48 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java
@@ -87,7 +87,7 @@ public class LectureListWindow extends LectureListWindowLayout {
 
 	private final RowFilter<ListModel<LectureSummary>, Integer> filterSearchTerm = new RowFilter<ListModel<LectureSummary>, Integer>() {
 		public boolean include(Entry<? extends ListModel<LectureSummary>, ? extends Integer> entry) {
-			LectureSummary lecture = lectureTable.getModelRow(entry.getIdentifier());
+			LectureSummary lecture = tblLectures.getModelRow(entry.getIdentifier());
 			if (searchFieldPattern.matcher(lecture.lectureName).find())
 				return true;
 			UserInfo user = UserCache.find(lecture.ownerId);
@@ -105,26 +105,26 @@ public class LectureListWindow extends LectureListWindowLayout {
 	// filter for own lectures 
 	private final RowFilter<ListModel<LectureSummary>, Integer> filterOwn = new RowFilter<ListModel<LectureSummary>, Integer>() {
 		public boolean include(Entry<? extends ListModel<LectureSummary>, ? extends Integer> entry) {
-			LectureSummary lecture = lectureTable.getModelRow(entry.getIdentifier());
+			LectureSummary lecture = tblLectures.getModelRow(entry.getIdentifier());
 			return lecture.userPermissions.admin || lecture.ownerId.equals(Session.getUserId());
 		}
 	};
 	// filter for active lectures
 	private final RowFilter<ListModel<LectureSummary>, Integer> filterActive = new RowFilter<ListModel<LectureSummary>, Integer>() {
 		public boolean include(Entry<? extends ListModel<LectureSummary>, ? extends Integer> entry) {
-			return lectureTable.getModelRow(entry.getIdentifier()).isEnabled;
+			return tblLectures.getModelRow(entry.getIdentifier()).isEnabled;
 		}
 	};
 	// filter for editable lectures
 	private final RowFilter<ListModel<LectureSummary>, Integer> filterEditable = new RowFilter<ListModel<LectureSummary>, Integer>() {
 		public boolean include(Entry<? extends ListModel<LectureSummary>, ? extends Integer> entry) {
-			return LecturePerms.canEdit(lectureTable.getModelRow(entry.getIdentifier()));
+			return LecturePerms.canEdit(tblLectures.getModelRow(entry.getIdentifier()));
 		}
 	};
 	// filter for expiring lectures
 	private final RowFilter<ListModel<LectureSummary>, Integer> filterExpiring = new RowFilter<ListModel<LectureSummary>, Integer>() {
 		public boolean include(Entry<? extends ListModel<LectureSummary>, ? extends Integer> entry) {
-			LectureSummary selLect = lectureTable.getModelRow(entry.getIdentifier());
+			LectureSummary selLect = tblLectures.getModelRow(entry.getIdentifier());
 			long end = selLect.getEndTime() * 1000l;
 			Calendar cal = Calendar.getInstance();
 			cal.setTime(new Date());
@@ -145,59 +145,59 @@ public class LectureListWindow extends LectureListWindowLayout {
 	public LectureListWindow() {
 		super();
 
-		lectureTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+		tblLectures.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 
 		// filter the objects in the table depending on the search field
-		searchTextField.getDocument().addDocumentListener(new TextChangeListener() {
+		txtSearch.getDocument().addDocumentListener(new TextChangeListener() {
 			@Override
 			public void changed() {
-				String str = searchTextField.getText();
+				String str = txtSearch.getText();
 				if (str == null || str.isEmpty()) {
 					searchFieldPattern = null;
 				} else {
 					try {
 						searchFieldPattern = Pattern.compile(str, Pattern.CASE_INSENSITIVE);
-						searchTextField.setForeground(UIManager.getColor("TextField.foreground"));
+						txtSearch.setForeground(UIManager.getColor("TextField.foreground"));
 					} catch (PatternSyntaxException ex) {
-						searchTextField.setForeground(Color.RED);
+						txtSearch.setForeground(Color.RED);
 					}
 				}
 				applyFilterOnTable();
 			}
 		});
 
-		filterCbo.addActionListener(new ActionListener() {
+		cboFilter.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				searchTextField.setEnabled(true);
+				txtSearch.setEnabled(true);
 				applyFilterOnTable();
 			}
 		});
 
-		newButton.addActionListener(new ActionListener() {
+		btnNewLecture.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				new LectureWizard(SwingUtilities.getWindowAncestor(me), null, null).setVisible(true);
 			}
 		});
 
-		editButton.addActionListener(new ActionListener() {
+		btnEditLecture.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				openLectureDetails(lectureTable.getSelectedItem());
+				openLectureDetails(tblLectures.getSelectedItem());
 			}
 		});
 
 		// delete lecture
-		deleteButton.addActionListener(new ActionListener() {
+		btnDeleteLecture.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				deleteLectures(lectureTable.getSelectedItems());
+				deleteLectures(tblLectures.getSelectedItems());
 			}
 		});
 
 		// return to mainMenu
-		switchViewButton.addActionListener(new ActionListener() {
+		btnSwitchView.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				MainWindow.showPage(ImageListWindow.class);
@@ -209,7 +209,7 @@ public class LectureListWindow extends LectureListWindowLayout {
 		 */
 		final PopupMenu pop = new PopupMenu(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				LectureSummary lecture = lectureTable.getSelectedItem();
+				LectureSummary lecture = tblLectures.getSelectedItem();
 				if (lecture == null)
 					return;
 				if (e.getSource().equals(popupItemNew)) {
@@ -247,7 +247,7 @@ public class LectureListWindow extends LectureListWindowLayout {
 					ImageDetailsWindow.open(JOptionPane.getFrameForComponent(me), lecture.imageBaseId, null);
 				}
 				if (e.getSource().equals(popupItemDelete)) {
-					deleteLectures(lectureTable.getSelectedItems());
+					deleteLectures(tblLectures.getSelectedItems());
 				}
 			}
 		});
@@ -259,11 +259,11 @@ public class LectureListWindow extends LectureListWindowLayout {
 		pop.addMenuItem(popupItemDelete);
 
 		// finally the table listeners
-		lectureTable.addMouseListener(new MouseAdapter() {
+		tblLectures.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2) {
-					openLectureDetails(lectureTable.getSelectedItem());
+					openLectureDetails(tblLectures.getSelectedItem());
 				}
 				processClick(e);
 			}
@@ -281,22 +281,22 @@ public class LectureListWindow extends LectureListWindowLayout {
 			private void processClick(MouseEvent e) {
 
 				// rowIndex at mouse cursor
-				int mouseRowIndex = lectureTable.rowAtPoint(e.getPoint());
+				int mouseRowIndex = tblLectures.rowAtPoint(e.getPoint());
 
 				// is the click event on an already selected row?
 				boolean alreadySelectedRow = false;
-				for (int i : lectureTable.getSelectedRows()) {
+				for (int i : tblLectures.getSelectedRows()) {
 					if (i == mouseRowIndex) {
 						alreadySelectedRow = true;
 						break;
 					}
 				}
 
-				if (mouseRowIndex >= 0 && mouseRowIndex < lectureTable.getRowCount()
+				if (mouseRowIndex >= 0 && mouseRowIndex < tblLectures.getRowCount()
 						&& SwingUtilities.isRightMouseButton(e)) {
 					// select row if it wasn't in selection before
 					if (!alreadySelectedRow) {
-						lectureTable.setRowSelectionInterval(mouseRowIndex, mouseRowIndex);
+						tblLectures.setRowSelectionInterval(mouseRowIndex, mouseRowIndex);
 					}
 					if (e.isPopupTrigger()) {
 						pop.show(e.getComponent(), e.getX(), e.getY());
@@ -305,7 +305,7 @@ public class LectureListWindow extends LectureListWindowLayout {
 			}
 		});
 
-		lectureTable.addKeyListener(new KeyAdapter() {
+		tblLectures.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyReleased(KeyEvent e) {
 				if (e.getKeyCode() == KeyEvent.VK_F5) {
@@ -314,35 +314,35 @@ public class LectureListWindow extends LectureListWindowLayout {
 			}
 		});
 
-		lectureTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+		tblLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
 			@Override
 			public void valueChanged(ListSelectionEvent e) {
-				LectureSummary item = lectureTable.getSelectedItem();
+				LectureSummary item = tblLectures.getSelectedItem();
 				updateAvailableOptions(item);
 			}
 		});
 		if (Session.canListImages()) {
-			filterCbo.setSelectedItem(FilterType.OWN);
+			cboFilter.setSelectedItem(FilterType.OWN);
 		} else {
-			filterCbo.setSelectedItem(FilterType.ALL);
+			cboFilter.setSelectedItem(FilterType.ALL);
 		}
 		updateAvailableOptions(null);
 
 		// Some keyboard shortcuts
-		lectureTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+		tblLectures.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
 				KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "details");
-		lectureTable.getActionMap().put("details", new AbstractAction() {
+		tblLectures.getActionMap().put("details", new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent ae) {
-				editButton.doClick();
+				btnEditLecture.doClick();
 			}
 		});
-		lectureTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+		tblLectures.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
 				KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
-		lectureTable.getActionMap().put("delete", new AbstractAction() {
+		tblLectures.getActionMap().put("delete", new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent ae) {
-				deleteButton.doClick();
+				btnDeleteLecture.doClick();
 			}
 		});
 	}
@@ -356,9 +356,9 @@ public class LectureListWindow extends LectureListWindowLayout {
 	 */
 	private void updateAvailableOptions(LectureSummary lecture) {
 		boolean admin = LecturePerms.canAdmin(lecture);
-		boolean singleSelection = !(lectureTable.getSelectedRows().length > 1);
+		boolean singleSelection = !(tblLectures.getSelectedRows().length > 1);
 
-		deleteButton.setEnabled(admin || !singleSelection);
+		btnDeleteLecture.setEnabled(admin || !singleSelection);
 		popupItemDelete.setEnabled(admin || !singleSelection);
 		popupItemLinked.setEnabled(Session.canListImages() && singleSelection);
 		popupItemDownload.setEnabled(Session.canListImages() && singleSelection);
@@ -414,7 +414,7 @@ public class LectureListWindow extends LectureListWindowLayout {
 	 * Applies the filter entered in the search field to the table
 	 */
 	private void applyFilterOnTable() {
-		if (filterCbo.getSelectedIndex() == -1)
+		if (cboFilter.getSelectedIndex() == -1)
 			return;
 
 		// Filter list we are about to fill
@@ -426,8 +426,8 @@ public class LectureListWindow extends LectureListWindowLayout {
 		}
 
 		// filters from the combobox
-		FilterType filterType = (FilterType) filterCbo.getSelectedItem();
-		lectureTable.setHighlightOwn(true);
+		FilterType filterType = (FilterType) cboFilter.getSelectedItem();
+		tblLectures.setHighlightOwn(true);
 		switch (filterType) {
 		case ALL:
 			// no additional filters
@@ -453,8 +453,8 @@ public class LectureListWindow extends LectureListWindowLayout {
 
 		// for using multiple filters
 		RowFilter<ListModel<LectureSummary>, Integer> andFilters = RowFilter.andFilter(filters);
-		lectureTable.getRowSorter().setRowFilter(andFilters);
-		setLectureCountLabel(lectureTable.getRowCount());
+		tblLectures.getRowSorter().setRowFilter(andFilters);
+		setLectureCountLabel(tblLectures.getRowCount());
 	}
 
 	private void refreshList(final boolean force) {
@@ -465,8 +465,8 @@ public class LectureListWindow extends LectureListWindowLayout {
 				Gui.asyncExec(new Runnable() {
 					@Override
 					public void run() {
-						lectureTable.setData(lectureList, true);
-						setLectureCountLabel(lectureTable.getRowCount());
+						tblLectures.setData(lectureList, true);
+						setLectureCountLabel(tblLectures.getRowCount());
 					}
 				});
 			}
@@ -481,8 +481,8 @@ public class LectureListWindow extends LectureListWindowLayout {
 	@Override
 	public void requestShow() {
 		// en-/disable buttons when student
-		switchViewButton.setEnabled(Session.canListImages());
-		newButton.setEnabled(Session.canListImages());
+		btnSwitchView.setEnabled(Session.canListImages());
+		btnNewLecture.setEnabled(Session.canListImages());
 		updateAvailableOptions(null);
 		refreshList(false);
 	}
@@ -492,14 +492,14 @@ public class LectureListWindow extends LectureListWindowLayout {
 			return;
 		RowFilter<ListModel<LectureSummary>, Integer> imageFilter = new RowFilter<ListModel<LectureSummary>, Integer>() {
 			public boolean include(Entry<? extends ListModel<LectureSummary>, ? extends Integer> entry) {
-				LectureSummary lecture = lectureTable.getModelRow(entry.getIdentifier());
+				LectureSummary lecture = tblLectures.getModelRow(entry.getIdentifier());
 				return imageBaseId.equals(lecture.imageBaseId);
 			}
 		};
-		filterCbo.setSelectedIndex(-1);
-		searchTextField.setText("");
-		searchTextField.setEnabled(false);
-		lectureTable.getRowSorter().setRowFilter(imageFilter);
-		setLectureCountLabel(lectureTable.getRowCount());
+		cboFilter.setSelectedIndex(-1);
+		txtSearch.setText("");
+		txtSearch.setEnabled(false);
+		tblLectures.getRowSorter().setRowFilter(imageFilter);
+		setLectureCountLabel(tblLectures.getRowCount());
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java
index 5ded8538..a134fedd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LecturePermissionWindow.java
@@ -32,7 +32,7 @@ public class LecturePermissionWindow extends LecturePermissionWindowLayout imple
 		/**
 		 * initialise the lecturePermissionManager
 		 */
-		lecturePermissionManager.initPanel(permissionMap, defaultPermissions, ownerId);
+		ctlPermissionManager.initPanel(permissionMap, defaultPermissions, ownerId);
 
 		chkCustomPermAdmin.setSelected(defaultPermissions.admin);
 		chkCustomPermEdit.setSelected(defaultPermissions.edit);
@@ -40,7 +40,7 @@ public class LecturePermissionWindow extends LecturePermissionWindowLayout imple
 		ActionListener updateDefaultPermissionListener = new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				lecturePermissionManager.updateDefaultPermissions(chkCustomPermAdmin.isSelected(),
+				ctlPermissionManager.updateDefaultPermissions(chkCustomPermAdmin.isSelected(),
 						chkCustomPermEdit.isSelected());
 			}
 		};
@@ -76,7 +76,7 @@ public class LecturePermissionWindow extends LecturePermissionWindowLayout imple
 	private void run() {
 		setVisible(true);
 		if (okUsed)
-			lecturePermissionManager.updatePermissionReferences();
+			ctlPermissionManager.updatePermissionReferences();
 	}
 
 	/**
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LocationSelectionWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LocationSelectionWindow.java
index bbdac096..b90aee06 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LocationSelectionWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LocationSelectionWindow.java
@@ -37,8 +37,8 @@ public class LocationSelectionWindow extends LocationSelectionWindowLayout imple
 	public LocationSelectionWindow(Window modalParent, List<Integer> locations, boolean limitToLocations) {
 		super(modalParent, locations, limitToLocations);
 
-		locationSelector.setSelectedLocationsAsIds(locations);
-		locationSelector.setOnlyInSelection(limitToLocations);
+		ctlLocationSelector.setSelectedLocationsAsIds(locations);
+		ctlLocationSelector.setOnlyInSelection(limitToLocations);
 
 		// listeners for the buttons
 		btnClose.addActionListener(new ActionListener() {
@@ -52,11 +52,11 @@ public class LocationSelectionWindow extends LocationSelectionWindowLayout imple
 		btnSaveChanges.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				List<Integer> tempIntList = locationSelector.getSelectedLocationsAsIds();
+				List<Integer> tempIntList = ctlLocationSelector.getSelectedLocationsAsIds();
 				if (tempIntList != null
 						&& tempIntList.size() > Session.getSatelliteConfig().maxLocationsPerLecture) {
-					locationSelector.setSelectedLocationsAsIds(tempIntList);
-					locationSelector.collapseFullySelectedNodes();
+					ctlLocationSelector.setSelectedLocationsAsIds(tempIntList);
+					ctlLocationSelector.collapseFullySelectedNodes();
 					Gui.showMessageBox("Bitten reduzieren Sie die Anzahl gewählter Orte",
 							MessageType.WARNING, null, null);
 					return;
@@ -67,10 +67,10 @@ public class LocationSelectionWindow extends LocationSelectionWindowLayout imple
 		});
 
 		// addCheckChangeEventListener
-		locationSelector.getTree().addCheckChangeEventListener(new CheckChangeEventListener() {
+		ctlLocationSelector.getTree().addCheckChangeEventListener(new CheckChangeEventListener() {
 			@Override
 			public void checkStateChanged(CheckChangeEvent event) {
-				List<Integer> tempIntList = locationSelector.getSelectedLocationsAsIds();
+				List<Integer> tempIntList = ctlLocationSelector.getSelectedLocationsAsIds();
 				if (tempIntList != null) {
 					if (tempIntList.size() > Session.getSatelliteConfig().maxLocationsPerLecture) {
 						// add error
@@ -94,8 +94,8 @@ public class LocationSelectionWindow extends LocationSelectionWindowLayout imple
 		setVisible(true);
 		if (!apply)
 			return null;
-		return new LocationInfo(locationSelector.getSelectedLocationsAsIds(),
-				locationSelector.getOnlyInSelection());
+		return new LocationInfo(ctlLocationSelector.getSelectedLocationsAsIds(),
+				ctlLocationSelector.getOnlyInSelection());
 	}
 
 	/**
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index d525062f..0c03df89 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -107,12 +107,12 @@ public class LoginWindow extends LoginWindowLayout {
 		});
 		// first do all listeners stuff
 		for (final LoginType type : LoginType.values()) {
-			loginTypes[type.id].setActionCommand(type.toString());
-			loginTypes[type.id].addItemListener(new ItemListener() {
+			rdoLoginType[type.id].setActionCommand(type.toString());
+			rdoLoginType[type.id].addItemListener(new ItemListener() {
 				@Override
 				public void itemStateChanged(ItemEvent e) {
 					if (e.getStateChange() == ItemEvent.SELECTED) {
-						idpCombo.setEnabled(idpCombo.getModel().getSize() != 0 && type == LoginType.ECP);
+						cboOrganization.setEnabled(cboOrganization.getModel().getSize() != 0 && type == LoginType.ECP);
 						loginType = type;
 					}
 				}
@@ -134,11 +134,11 @@ public class LoginWindow extends LoginWindowLayout {
 			enableLogin(false);
 		}
 		// While filling, disable
-		idpCombo.setEnabled(false);
+		cboOrganization.setEnabled(false);
 		// Not yet implemented, disable
-		loginTypes[LoginType.DIRECT_CONNECT.id].setEnabled(false);
+		rdoLoginType[LoginType.DIRECT_CONNECT.id].setEnabled(false);
 		// enable the corresponding button
-		loginTypes[savedLoginType.id].setSelected(true);
+		rdoLoginType[savedLoginType.id].setSelected(true);
 		loginType = savedLoginType;
 
 		QuickTimer.scheduleOnce(new Task() {
@@ -174,7 +174,7 @@ public class LoginWindow extends LoginWindowLayout {
 
 		KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(satelliteShiftDispatcher);
 
-		loginButton.addActionListener(new ActionListener() {
+		btnLogin.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				doLogin();
@@ -182,12 +182,12 @@ public class LoginWindow extends LoginWindowLayout {
 		});
 
 		// make enter key activate login
-		loginFormPanel.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+		pnlLoginForm.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
 				KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "login");
-		loginFormPanel.getActionMap().put("login", new AbstractAction() {
+		pnlLoginForm.getActionMap().put("login", new AbstractAction() {
 			@Override
 			public void actionPerformed(ActionEvent ae) {
-				loginButton.doClick();
+				btnLogin.doClick();
 			}
 		});
 
@@ -198,27 +198,27 @@ public class LoginWindow extends LoginWindowLayout {
 			}
 		});
 
-		usernameField.getDocument().addDocumentListener(new TextChangeListener() {
+		txtUsername.getDocument().addDocumentListener(new TextChangeListener() {
 			@Override
 			public void changed() {
-				if (idpCombo.getSelectedIndex() != -1)
+				if (cboOrganization.getSelectedIndex() != -1)
 					return;
-				String name = usernameField.getText();
+				String name = txtUsername.getText();
 				int at = name.indexOf('@');
 				if (at == -1)
 					return;
-				final int oldCursorPos = usernameField.getCaretPosition();
+				final int oldCursorPos = txtUsername.getCaretPosition();
 				String suffix = name.substring(at + 1);
 				Organization organization = OrganizationCache.find(suffix);
 				if (organization == null)
 					return;
 				final String nameOnly = name.substring(0, at);
-				idpCombo.setSelectedItem(organization);
+				cboOrganization.setSelectedItem(organization);
 				Gui.asyncExec(new Runnable() {
 					@Override
 					public void run() {
-						usernameField.setText(nameOnly);
-						usernameField.setCaretPosition(Math.min(oldCursorPos, nameOnly.length()));
+						txtUsername.setText(nameOnly);
+						txtUsername.setCaretPosition(Math.min(oldCursorPos, nameOnly.length()));
 					}
 				});
 			}
@@ -238,11 +238,11 @@ public class LoginWindow extends LoginWindowLayout {
 			return;
 		}
 
-		idpCombo.setModel(new DefaultComboBoxModel<Organization>(orgs.toArray(new Organization[orgs.size()])));
+		cboOrganization.setModel(new DefaultComboBoxModel<Organization>(orgs.toArray(new Organization[orgs.size()])));
 		// now check if we had a saved identity provider
 		String savedOrganizationId = Config.getIdentityProvider();
-		idpCombo.setSelectedItem(OrganizationCache.find(savedOrganizationId));
-		idpCombo.setEnabled(idpCombo.getModel().getSize() != 0 && loginType == LoginType.ECP);
+		cboOrganization.setSelectedItem(OrganizationCache.find(savedOrganizationId));
+		cboOrganization.setEnabled(cboOrganization.getModel().getSize() != 0 && loginType == LoginType.ECP);
 	}
 
 	/**
@@ -251,9 +251,9 @@ public class LoginWindow extends LoginWindowLayout {
 	 */
 	private void doSaveConfig() {
 		// first we need to check if the "Remember me" button is active
-		if (saveUsernameCheck.isSelected()) {
+		if (chkSaveUsername.isSelected()) {
 			// save username
-			String username = usernameField.getText();
+			String username = txtUsername.getText();
 			if (!username.isEmpty()) {
 				Config.setUsername(username);
 			}
@@ -263,7 +263,7 @@ public class LoginWindow extends LoginWindowLayout {
 		// always save the authentication method and potentially the identity provider
 		Config.setAuthenticationMethod(loginType.toString());
 		// save the selected identity provider
-		Organization selectedOrg = idpCombo.getItemAt(idpCombo.getSelectedIndex());
+		Organization selectedOrg = cboOrganization.getItemAt(cboOrganization.getSelectedIndex());
 		if (selectedOrg != null) {
 			Config.setIdentityProvider(selectedOrg.organizationId);
 		}
@@ -282,15 +282,15 @@ public class LoginWindow extends LoginWindowLayout {
 					LOGGER, null);
 			return;
 		}
-		if (loginType == LoginType.ECP && idpCombo.getSelectedIndex() == -1) {
+		if (loginType == LoginType.ECP && cboOrganization.getSelectedIndex() == -1) {
 			Gui.showMessageBox(this, "Bitte wählen Sie ihre Organisation als 'Identity Provider'.",
 					MessageType.ERROR, LOGGER, null);
-			idpCombo.requestFocusInWindow();
+			cboOrganization.requestFocusInWindow();
 			return;
 		}
 		// here we only check for the fields
-		String username = usernameField.getText();
-		final String password = String.copyValueOf(passwordField.getPassword());
+		String username = txtUsername.getText();
+		final String password = String.copyValueOf(txtPassword.getPassword());
 		// login clicked, lets first read the fields
 		if (username.isEmpty()) {
 			Gui.showMessageBox(this, NO_USERNAME, MessageType.ERROR, LOGGER, null);
@@ -302,7 +302,7 @@ public class LoginWindow extends LoginWindowLayout {
 		}
 
 		// determine which organization was selected by the user.
-		Organization selectedOrg = idpCombo.getItemAt(idpCombo.getSelectedIndex());
+		Organization selectedOrg = cboOrganization.getItemAt(cboOrganization.getSelectedIndex());
 
 		// now lets check if the username contains an organization
 		// for this we just check if the given username contains a '@'
@@ -322,12 +322,12 @@ public class LoginWindow extends LoginWindowLayout {
 										+ "\nWollen Sie die in Ihrem Benutzername gefundene Organisation verwenden?",
 								MessageType.QUESTION_YESNO, null, null);
 						if (ret) {
-							idpCombo.setSelectedItem(orgInUsername);
+							cboOrganization.setSelectedItem(orgInUsername);
 							selectedOrg = orgInUsername;
 						}
 					}
 					// always set the username to everything before '@'
-					usernameField.setText(usernameSplit[0]);
+					txtUsername.setText(usernameSplit[0]);
 					username = usernameSplit[0];
 				}
 			}
@@ -424,7 +424,7 @@ public class LoginWindow extends LoginWindowLayout {
 		importFingerprints(data.satellites);
 		// now try to init the session with the data received
 		if (ThriftActions.initSession(data, forceCustomSatellite, SwingUtilities.getWindowAncestor(this))) {
-			if (saveUsernameCheck.isSelected()) {
+			if (chkSaveUsername.isSelected()) {
 				Config.saveCurrentSession(Session.getSatelliteAddress(), Session.getSatelliteToken(),
 						Session.getMasterToken());
 			}
@@ -439,21 +439,21 @@ public class LoginWindow extends LoginWindowLayout {
 	}
 
 	private void enableLogin(boolean enable) {
-		loginButton.setEnabled(enable);
-		usernameField.setEnabled(enable);
-		passwordField.setEnabled(enable);
-		loginTypePanel.setEnabled(enable);
-		loginFormPanel.setEnabled(enable);
-		saveUsernameCheck.setEnabled(enable);
+		btnLogin.setEnabled(enable);
+		txtUsername.setEnabled(enable);
+		txtPassword.setEnabled(enable);
+		pnlLoginType.setEnabled(enable);
+		pnlLoginForm.setEnabled(enable);
+		chkSaveUsername.setEnabled(enable);
 		if (enable) {
 			// Do this here, otherwise the focus might not be set
 			String savedUsername = Config.getUsername();
 			if (savedUsername != null && !savedUsername.isEmpty()) {
-				usernameField.setText(savedUsername);
-				saveUsernameCheck.setSelected(true);
-				passwordField.requestFocusInWindow();
+				txtUsername.setText(savedUsername);
+				chkSaveUsername.setSelected(true);
+				txtPassword.requestFocusInWindow();
 			} else {
-				usernameField.requestFocusInWindow();
+				txtUsername.requestFocusInWindow();
 			}
 		}
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java
index 0fbd5c0a..ef805799 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/MainMenuWindow.java
@@ -13,7 +13,7 @@ public class MainMenuWindow extends MainMenuWindowLayout {
 	public MainMenuWindow() {
 		super();
 		// function for vmButton
-		vmButton.addActionListener(new ActionListener() {
+		btnShowVirtualMachines.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				MainWindow.showPage(ImageListWindow.class);
@@ -21,7 +21,7 @@ public class MainMenuWindow extends MainMenuWindowLayout {
 		});
 
 		// function for lecturesButton
-		lectureButton.addActionListener(new ActionListener() {
+		btnShowLectures.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				MainWindow.showPage(LectureListWindow.class);
@@ -36,6 +36,6 @@ public class MainMenuWindow extends MainMenuWindowLayout {
 
 	@Override
 	public void requestShow() {
-		vmButton.setEnabled(Session.canListImages());
+		btnShowVirtualMachines.setEnabled(Session.canListImages());
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/SatelliteListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/SatelliteListWindow.java
index c4e02306..bd8447b3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/SatelliteListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/SatelliteListWindow.java
@@ -59,49 +59,49 @@ public class SatelliteListWindow extends SatelliteListWindowLayout implements Ui
 					if (sat.displayName.equals(lastSat)) {
 						entry.getKey().setSelected(true);
 						entry.getKey().requestFocus();
-						customIpField.setEnabled(false);
+						txtCustomAddress.setEnabled(false);
 						lastSat = "";
 					}
 				}
 				entry.getKey().addMouseListener(radioDoubleClick);
 			}
 		} else {
-			radioCustomIp.setSelected(true);
-			customIpField.requestFocus();
+			rdoCusomAddress.setSelected(true);
+			txtCustomAddress.requestFocus();
 		}
 		if (lastSat.startsWith("@")) {
-			customIpField.setText(lastSat.substring(1));
-			radioCustomIp.setSelected(true);
-			customIpField.requestFocus();
+			txtCustomAddress.setText(lastSat.substring(1));
+			rdoCusomAddress.setSelected(true);
+			txtCustomAddress.requestFocus();
 		}
 
 		// deactivate the custom field when selecting a satellite to make things clearer for user
 		ActionListener listener = new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				customIpField.setEnabled(radioCustomIp.isSelected());
+				txtCustomAddress.setEnabled(rdoCusomAddress.isSelected());
 			}
 		};
 		for (JRadioButton radio : radioToSat.keySet()) {
 			radio.addActionListener(listener);
 		}
-		radioCustomIp.addActionListener(listener);
+		rdoCusomAddress.addActionListener(listener);
 
 		// Cancel button
-		cancelButton.addActionListener(new ActionListener() {
+		btnCancel.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				dispose();
 			}
 		});
 		// Continue button
-		nextButton.addActionListener(new ActionListener() {
+		btnContinue.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				prepareSelection();
 				if (satellite != null) {
-					if (radioCustomIp.isSelected()) {
-						Config.setLastSatellite("@" + customIpField.getText());
+					if (rdoCusomAddress.isSelected()) {
+						Config.setLastSatellite("@" + txtCustomAddress.getText());
 					} else if (satellite.displayName != null && !satellite.displayName.isEmpty()) {
 						Config.setLastSatellite(satellite.displayName);
 					}
@@ -112,14 +112,14 @@ public class SatelliteListWindow extends SatelliteListWindowLayout implements Ui
 			}
 		});
 
-		getRootPane().setDefaultButton(nextButton);
+		getRootPane().setDefaultButton(btnContinue);
 
 		Gui.centerShellOverShell(modalParent, this);
 	}
 
 	private void prepareSelection() {
 		// satellite is selected
-		if (!radioCustomIp.isSelected()) {
+		if (!rdoCusomAddress.isSelected()) {
 			// check, which satellite is selected
 			for (Entry<JRadioButton, Satellite> entry : radioToSat.entrySet()) {
 				if (entry.getKey().isSelected()) {
@@ -129,10 +129,10 @@ public class SatelliteListWindow extends SatelliteListWindowLayout implements Ui
 			}
 		}
 		// custom button selected
-		if (radioCustomIp.isSelected() && !customIpField.getText().isEmpty()) {
+		if (rdoCusomAddress.isSelected() && !txtCustomAddress.getText().isEmpty()) {
 			satellite = new Satellite();
 			satellite.addressList = new ArrayList<String>();
-			satellite.addressList.add(customIpField.getText());
+			satellite.addressList.add(txtCustomAddress.getText());
 		}
 	}
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
index c24af053..fb1c5c1a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/UserListWindow.java
@@ -77,20 +77,20 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback {
 		});
 
 		// filter the objects in the table depending on the search field
-		searchUserField.getDocument().addDocumentListener(new TextChangeListener() {
+		txtSearch.getDocument().addDocumentListener(new TextChangeListener() {
 			@Override
 			public void changed() {
 				try {
 					userTable.getRowSorter().setRowFilter(
-							RowFilter.regexFilter("(?i)" + searchUserField.getText()));
-					searchUserField.setForeground(UIManager.getColor("TextField.foreground"));
+							RowFilter.regexFilter("(?i)" + txtSearch.getText()));
+					txtSearch.setForeground(UIManager.getColor("TextField.foreground"));
 				} catch (IllegalArgumentException ex) {
-					searchUserField.setForeground(Color.RED);
+					txtSearch.setForeground(Color.RED);
 				}
 			}
 		});
 
-		setButton.addActionListener(new ActionListener() {
+		btnConfirm.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				final UserInfo user = userTable.getSelectedItem();
@@ -100,20 +100,20 @@ public class UserListWindow extends UserListWindowLayout implements UiFeedback {
 			}
 		});
 
-		cancelButton.addActionListener(new ActionListener() {
+		btnCancel.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				dispose();
 			}
 		});
 
-		getRootPane().setDefaultButton(setButton);
+		getRootPane().setDefaultButton(btnConfirm);
 
 		userTable.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				if (e.getClickCount() == 2) {
-					setButton.doClick();
+					btnConfirm.doClick();
 				}
 			}
 		});
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
index 98fdec40..9f7258b0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
@@ -27,7 +27,7 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout imple
 		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
 		// function for close button
-		continueButton.addActionListener(new ActionListener() {
+		btnClose.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				Config.setVirtualizerRead(true);
@@ -42,7 +42,7 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout imple
 			}
 		});
 
-		btnDL.addActionListener(new ActionListener() {
+		btnDownload.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				OpenLinks.openWebpage(Link.VMWARE);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
index bdb7e806..bd9a3b71 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
@@ -8,12 +8,12 @@ import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
 import org.openslx.dozmod.gui.Gui;
+import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
 
 @SuppressWarnings("serial")
@@ -26,13 +26,12 @@ public abstract class CheckUpdateWindowLayout extends JDialog {
 	protected static JButton btnLink;
 	protected static JButton btnClose;
 
-	protected JLabel lblLocalVersion = new JLabel("-");
-	protected JLabel lblRemoteVersion = new JLabel("-");
-	protected JLabel lblLocalVersionTime = new JLabel("-");
-	protected JLabel lblRemoteVersionTime = new JLabel("-");
+	protected final QLabel lblLocalVersion = new QLabel("-");
+	protected final QLabel lblRemoteVersion = new QLabel("-");
+	protected final QLabel lblLocalVersionTime = new QLabel("-");
+	protected final QLabel lblRemoteVersionTime = new QLabel("-");
 
-	protected JScrollPane changelogPanel;
-	protected JTextArea txtChangelog;
+	protected final JTextArea txtChangelog;
 
 	public CheckUpdateWindowLayout(Frame modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
@@ -49,12 +48,12 @@ public abstract class CheckUpdateWindowLayout extends JDialog {
 		JPanel infoPanel = new JPanel();
 		GridManager infoGrid = new GridManager(infoPanel, 4);
 		infoPanel.setBorder(BorderFactory.createTitledBorder(noticeLabel));
-		infoGrid.add(new JLabel("Ihre Version"));
+		infoGrid.add(new QLabel("Ihre Version"));
 		infoGrid.add(Box.createHorizontalStrut(10));
 		infoGrid.add(lblLocalVersion);
 		infoGrid.add(Box.createHorizontalGlue()).fill(true, false).expand(true, false);
 		infoGrid.nextRow();
-		infoGrid.add(new JLabel("Aktuelle Version"));
+		infoGrid.add(new QLabel("Aktuelle Version"));
 		infoGrid.add(Box.createHorizontalStrut(10));
 		infoGrid.add(lblRemoteVersion);
 		infoGrid.add(Box.createHorizontalGlue()).fill(true, false).expand(true, false);
@@ -63,8 +62,8 @@ public abstract class CheckUpdateWindowLayout extends JDialog {
 		txtChangelog = new JTextArea("-", 30, 20);
 		txtChangelog.setLineWrap(true);
 		txtChangelog.setWrapStyleWord(true);
-		changelogPanel = new JScrollPane(txtChangelog, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-				JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+		JScrollPane changelogPanel = new JScrollPane(txtChangelog, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		changelogPanel.setBorder(BorderFactory.createTitledBorder("Changelog"));
 
 		// checkbox for acknowledging the disclaimer
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
index c2061287..36ba1a86 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
@@ -35,8 +35,8 @@ public abstract class DisclaimerWindowLayout extends JDialog {
 	private static String continueButtonLabel = "Weiter";
 
 	// Buttons
-	protected JCheckBox chkAgreeBox;
-	protected JButton btnContinue;
+	protected final JCheckBox chkAgreeBox;
+	protected final JButton btnContinue;
 
 	public DisclaimerWindowLayout(Frame modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
index 2689d5f3..c572f5ec 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
@@ -62,10 +62,10 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 	protected final JButton btnClose;
 
 	protected final JButton btnShowLinkingLectures;
-	protected final QLabel linkedLectureCount;
+	protected final QLabel lblLinkedLectureCount;
 
-	protected final ImageVersionTable versionTable;
-	protected QScrollPane versionTableScrollPane;
+	protected final ImageVersionTable tblVersions;
+	protected final QScrollPane scpVersions;
 
 	public ImageDetailsWindowLayout(Frame modalParent) {
 		super(modalParent, "<init>", ModalityType.APPLICATION_MODAL);
@@ -185,8 +185,8 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		grid.nextRow();
 
 		grid.add(new QLabel("Veranstaltungen"));
-		linkedLectureCount = new QLabel();
-		grid.add(linkedLectureCount).expand(true, false);
+		lblLinkedLectureCount = new QLabel();
+		grid.add(lblLinkedLectureCount).expand(true, false);
 		btnShowLinkingLectures = new JButton("Anzeigen");
 		grid.add(btnShowLinkingLectures).fill(true, false);
 		grid.nextRow();
@@ -222,10 +222,10 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		QLabel lblVersion = new QLabel("Image-Versionen");
 		lblVersion.setFont(lblVersion.getFont().deriveFont(Font.BOLD));
 		versionTablePanel.add(lblVersion, BorderLayout.PAGE_START);
-		versionTable = new ImageVersionTable();
-		versionTableScrollPane = new QScrollPane(versionTable);
-		versionTableScrollPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-		versionTablePanel.add(versionTableScrollPane, BorderLayout.CENTER);
+		tblVersions = new ImageVersionTable();
+		scpVersions = new QScrollPane(tblVersions);
+		scpVersions.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+		versionTablePanel.add(scpVersions, BorderLayout.CENTER);
 
 		// add the tabel panel to the right panel
 		JPanel rightPanel = new JPanel();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
index e14267e3..1fa98797 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
@@ -33,13 +33,13 @@ public abstract class ImageListWindowLayout extends CompositePage {
 
 	// --------------------------------------
 	// search field, table and buttons
-	protected final ImageListViewer imageListViewer;
-	protected final JButton newButton;
-	protected final JButton newLectureButton;
-	protected final JButton editButton;
-	protected final JButton downloadButton;
-	protected final JButton deleteButton;
-	protected final JButton switchViewButton;
+	protected final ImageListViewer ctlImageListViewer;
+	protected final JButton btnNewVm;
+	protected final JButton btnNewLecture;
+	protected final JButton btnEditDetails;
+	protected final JButton btnDownload;
+	protected final JButton btnDelete;
+	protected final JButton btnSwitchView;
 
 	public ImageListWindowLayout() {
 		super(new BorderLayout());
@@ -54,34 +54,34 @@ public abstract class ImageListWindowLayout extends CompositePage {
 		infoPanel.add(infoTitle, BorderLayout.NORTH);
 		infoPanel.add(infoText, BorderLayout.CENTER);
 
-		imageListViewer = new ImageListViewer(FilterType.USABLE);
+		ctlImageListViewer = new ImageListViewer(FilterType.USABLE);
 
 		// --------------------------------------
 		// the buttons at the bottom
 		JPanel buttonPanel = new JPanel();
 		buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
 		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
-		newButton = new JButton(newButtonLabel);
-		newLectureButton = new JButton(newLectureButtonLabel);
-		deleteButton = new JButton(deleteButtonLabel);
-		editButton = new JButton(editButtonLabel);
-		downloadButton = new JButton(downloadButtonLabel);
-		switchViewButton = new JButton(switchViewButtonLabel);
-		buttonPanel.add(newButton);
+		btnNewVm = new JButton(newButtonLabel);
+		btnNewLecture = new JButton(newLectureButtonLabel);
+		btnDelete = new JButton(deleteButtonLabel);
+		btnEditDetails = new JButton(editButtonLabel);
+		btnDownload = new JButton(downloadButtonLabel);
+		btnSwitchView = new JButton(switchViewButtonLabel);
+		buttonPanel.add(btnNewVm);
 		buttonPanel.add(Box.createRigidArea(new Dimension(5, 0)));
-		buttonPanel.add(newLectureButton);
-		buttonPanel.add(editButton);
-		buttonPanel.add(downloadButton);
+		buttonPanel.add(btnNewLecture);
+		buttonPanel.add(btnEditDetails);
+		buttonPanel.add(btnDownload);
 		buttonPanel.add(Box.createRigidArea(new Dimension(5, 0)));
-		buttonPanel.add(deleteButton);
+		buttonPanel.add(btnDelete);
 		buttonPanel.add(Box.createHorizontalGlue());
-		buttonPanel.add(switchViewButton);
+		buttonPanel.add(btnSwitchView);
 
 		// put everything together
 		GridManager grid = new GridManager(this, 1);
 		grid.add(infoPanel).fill(true, false).expand(true, false);
 		grid.nextRow();
-		grid.add(imageListViewer).fill(true, true).expand(true, true);
+		grid.add(ctlImageListViewer).fill(true, true).expand(true, true);
 		grid.nextRow();
 		grid.add(buttonPanel).fill(true, false).expand(true, false);
 		grid.nextRow();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
index e87400f8..8d751a31 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
@@ -65,15 +65,15 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 	protected final JButton btnPermissions;
 	protected final JButton btnLocations;
 
-	protected QLabel lblError;
+	protected final QLabel lblError;
 	protected final JButton btnSaveChanges;
 	protected final JButton btnClose;
 	protected final JButton btnDownloadImage;
 
-	protected JDatePickerImpl startDate;
-	protected JDatePickerImpl endDate;
-	protected JSpinner startTime;
-	protected JSpinner endTime;
+	protected final JDatePickerImpl dtpStartDate;
+	protected final JDatePickerImpl dtpEndDate;
+	protected final JSpinner spnStartTime;
+	protected final JSpinner spnEndTime;
 
 	protected Color dateTimeTextColor;
 
@@ -180,11 +180,11 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		// start time of the lecture
 		JPanel startTimePanel = new JPanel();
 		startTimePanel.setLayout(new BoxLayout(startTimePanel, BoxLayout.LINE_AXIS));
-		startDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+		dtpStartDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
 				new DateLabelFormatter());
-		startTime = makeTimeSpinner(23, 59);
-		startTimePanel.add(startDate);
-		startTimePanel.add(startTime);
+		spnStartTime = makeTimeSpinner(23, 59);
+		startTimePanel.add(dtpStartDate);
+		startTimePanel.add(spnStartTime);
 		startTimePanel.setMinimumSize(startTimePanel.getPreferredSize());
 		startTimePanel.setMaximumSize(startTimePanel.getPreferredSize());
 		lblStartTime = new QLabel();
@@ -195,11 +195,11 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		// end time of the lecture
 		JPanel endTimePanel = new JPanel();
 		endTimePanel.setLayout(new BoxLayout(endTimePanel, BoxLayout.LINE_AXIS));
-		endDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+		dtpEndDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
 				new DateLabelFormatter());
-		endTime = makeTimeSpinner(00, 59);
-		endTimePanel.add(endDate);
-		endTimePanel.add(endTime);
+		spnEndTime = makeTimeSpinner(00, 59);
+		endTimePanel.add(dtpEndDate);
+		endTimePanel.add(spnEndTime);
 		endTimePanel.setMinimumSize(endTimePanel.getPreferredSize());
 		endTimePanel.setMaximumSize(endTimePanel.getPreferredSize());
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
index 476a9a2e..7aee0f30 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
@@ -4,8 +4,6 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.GridBagLayout;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -14,7 +12,6 @@ import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.UIManager;
 import javax.swing.border.TitledBorder;
@@ -38,16 +35,16 @@ public abstract class LectureListWindowLayout extends CompositePage {
 	private static final String infoTextString = "Hier können Sie Veranstaltungen anlegen, bearbeiten und löschen.";
 
 	// buttons
-	protected final JButton newButton;
-	protected final JButton deleteButton;
-	protected final JButton editButton;
-	protected final JButton switchViewButton;
-	protected final JComboBox<FilterType> filterCbo;
-	protected JLabel lectureCountLabel;
+	protected final JButton btnNewLecture;
+	protected final JButton btnDeleteLecture;
+	protected final JButton btnEditLecture;
+	protected final JButton btnSwitchView;
+	protected final JComboBox<FilterType> cboFilter;
+	protected final QLabel lblVisibleLectureCount;
 
-	protected final JTextField searchTextField;
+	protected final JTextField txtSearch;
 
-	protected final LectureTable lectureTable;
+	protected final LectureTable tblLectures;
 
 	public LectureListWindowLayout() {
 		super(new GridBagLayout());
@@ -72,29 +69,28 @@ public abstract class LectureListWindowLayout extends CompositePage {
 		JPanel filterPanel = new JPanel();
 		filterPanel.setBorder(new TitledBorder(filterPanelLabel));
 		filterPanel.setLayout(new BoxLayout(filterPanel, BoxLayout.LINE_AXIS));
-		searchTextField = new JTextField();
-		filterCbo = new JComboBox<FilterType>();
+		txtSearch = new JTextField();
+		cboFilter = new JComboBox<FilterType>();
 		for (FilterType s : FilterType.values()) {
-			filterCbo.addItem(s);
+			cboFilter.addItem(s);
 		}
-		filterPanel.add(searchTextField);
-		filterPanel.add(filterCbo);
+		filterPanel.add(txtSearch);
+		filterPanel.add(cboFilter);
 
 		// Panel for itemCount
 		JPanel lectureCountPanel = new JPanel();
-		lectureCountLabel = new JLabel();
+		lblVisibleLectureCount = new QLabel();
 		lectureCountPanel.add(new JLabel("Sichtbar:"));
-		lectureCountPanel.add(lectureCountLabel);
+		lectureCountPanel.add(lblVisibleLectureCount);
 		filterPanel.add(lectureCountPanel);
 
 		// the actual table
-		lectureTable = new LectureTable();
+		tblLectures = new LectureTable();
 
 		tableGrid.add(filterPanel).fill(true, false).expand(true, false);
 		tableGrid.nextRow();
-		QScrollPane jsp = new QScrollPane(lectureTable);
+		QScrollPane jsp = new QScrollPane(tblLectures);
 
-		
 		jsp.setBackground(UIManager.getColor("Table.background"));
 		tableGrid.add(jsp).fill(true, true).expand(true, true);
 		tableGrid.nextRow();
@@ -106,17 +102,17 @@ public abstract class LectureListWindowLayout extends CompositePage {
 		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
 		buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
 
-		newButton = new JButton(newButtonLabel);
-		buttonPanel.add(newButton);
+		btnNewLecture = new JButton(newButtonLabel);
+		buttonPanel.add(btnNewLecture);
 		buttonPanel.add(Box.createRigidArea(new Dimension(5, 0)));
-		editButton = new JButton(editButtonLabel);
-		buttonPanel.add(editButton);
+		btnEditLecture = new JButton(editButtonLabel);
+		buttonPanel.add(btnEditLecture);
 		buttonPanel.add(Box.createRigidArea(new Dimension(5, 0)));
-		deleteButton = new JButton(deleteButtonLabel);
-		buttonPanel.add(deleteButton);
+		btnDeleteLecture = new JButton(deleteButtonLabel);
+		buttonPanel.add(btnDeleteLecture);
 		buttonPanel.add(Box.createHorizontalGlue());
-		switchViewButton = new JButton(switchViewButtonLabel);
-		buttonPanel.add(switchViewButton);
+		btnSwitchView = new JButton(switchViewButtonLabel);
+		buttonPanel.add(btnSwitchView);
 		// ----------------- end group for table -------------------------
 
 		grid.add(infoPanel).fill(true, false).expand(true, false);
@@ -130,7 +126,7 @@ public abstract class LectureListWindowLayout extends CompositePage {
 	}
 
 	protected void setLectureCountLabel(int i) {
-		lectureCountLabel.setText(Integer.toString(i));
+		lblVisibleLectureCount.setText(Integer.toString(i));
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java
index 5e67de86..1408242d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LecturePermissionWindowLayout.java
@@ -34,7 +34,7 @@ public class LecturePermissionWindowLayout extends JDialog {
 	/**
 	 * The lecturePermissionManager to use.
 	 */
-	protected final LectureCustomPermissionManager lecturePermissionManager;
+	protected final LectureCustomPermissionManager ctlPermissionManager;
 
 	/**
 	 * The title of the window.
@@ -53,7 +53,7 @@ public class LecturePermissionWindowLayout extends JDialog {
 		GridManager grid = new GridManager(contentPanel, 1);
 
 		// create the lecturePermissionManager and add it to the pane.
-		lecturePermissionManager = new LectureCustomPermissionManager();
+		ctlPermissionManager = new LectureCustomPermissionManager();
 
 		// Panel with the default permissions
 		JPanel defaultPermissionPane = new JPanel();
@@ -73,7 +73,7 @@ public class LecturePermissionWindowLayout extends JDialog {
 		buttonPane.add(btnOk);
 
 		// Put everything into the grid
-		grid.add(lecturePermissionManager).fill(true, true).expand(true, true);
+		grid.add(ctlPermissionManager).fill(true, true).expand(true, true);
 		grid.nextRow();
 		grid.add(defaultPermissionPane).fill(true, false).expand(true, false);
 		grid.nextRow();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java
index 57b859a4..74801fc6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java
@@ -24,7 +24,7 @@ public class LocationSelectionWindowLayout extends JDialog {
 	 * 
 	 */
 	private static final long serialVersionUID = -7722131149214063979L;
-	protected final LocationSelector locationSelector;
+	protected final LocationSelector ctlLocationSelector;
 	protected final JButton btnSaveChanges;
 	protected final JButton btnClose;
 	protected final QLabel lblError;
@@ -37,18 +37,18 @@ public class LocationSelectionWindowLayout extends JDialog {
 		GridManager grid = new GridManager(this, 1);
 		WordWrapLabel header = new WordWrapLabel(
 				"Hier können Sie die Räume auswählen, in denen diese Veranstaltung sichtbar sein soll.");
-		locationSelector = new LocationSelector();
+		ctlLocationSelector = new LocationSelector();
 		grid.add(header).fill(true, false).expand(true, false);
 		grid.nextRow();
 		grid.add(new JSeparator());
 		grid.nextRow();
-		grid.add(locationSelector).fill(true, true).expand(true, true);
+		grid.add(ctlLocationSelector).fill(true, true).expand(true, true);
 		grid.nextRow();
 		// button panel on the bottom
 		JPanel buttonPanel = new JPanel();
 		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS));
 		lblError = new QLabel();
-		lblError.setForeground(Color.red);
+		lblError.setForeground(Color.RED);
 		btnClose = new JButton("Abbrechen");
 		btnSaveChanges = new JButton("Übernehmen");
 		buttonPanel.add(lblError);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index 4b1db451..aadced38 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -52,17 +52,17 @@ public abstract class LoginWindowLayout extends JDialog {
 	private static final String LOGIN_FORM_LABEL = "Zugangsdaten";
 
 	// login type panel
-	protected final JRadioButton[] loginTypes = new JRadioButton[3];
+	protected final JRadioButton[] rdoLoginType = new JRadioButton[3];
 	protected final JButton btnSettings;
 
 	// login form panel
-	protected final JComboBox<Organization> idpCombo;
-	protected final JTextField usernameField;
-	protected final JPasswordField passwordField;
-	protected final JCheckBox saveUsernameCheck;
-	protected final JButton loginButton;
-	protected final JPanel loginTypePanel;
-	protected final JPanel loginFormPanel;
+	protected final JComboBox<Organization> cboOrganization;
+	protected final JTextField txtUsername;
+	protected final JPasswordField txtPassword;
+	protected final JCheckBox chkSaveUsername;
+	protected final JButton btnLogin;
+	protected final JPanel pnlLoginType;
+	protected final JPanel pnlLoginForm;
 
 	/**
 	 * Create a new login composite
@@ -79,12 +79,12 @@ public abstract class LoginWindowLayout extends JDialog {
 		grid.add(new QLabel(getScaledLogo()), 2);
 		grid.nextRow();
 
-		loginTypes[0] = new JRadioButton("Authentifizierung über bwIDM");
-		loginTypes[1] = new JRadioButton("Test-Zugang mit festem Benutzer");
-		loginTypes[2] = new JRadioButton("Direkter Zugang zum Satelliten");
+		rdoLoginType[0] = new JRadioButton("Authentifizierung über bwIDM");
+		rdoLoginType[1] = new JRadioButton("Test-Zugang mit festem Benutzer");
+		rdoLoginType[2] = new JRadioButton("Direkter Zugang zum Satelliten");
 		btnSettings = new JButton("Einstellungen");
 
-		idpCombo = new ComboBox<>(new ComboBoxRenderer<Organization>() {
+		cboOrganization = new ComboBox<>(new ComboBoxRenderer<Organization>() {
 			@Override
 			public String renderItem(Organization item) {
 				if (item == null)
@@ -97,15 +97,15 @@ public abstract class LoginWindowLayout extends JDialog {
 				return "Wird geladen...";
 			}
 		});
-		usernameField = new JTextField();
-		passwordField = new JPasswordField();
-		loginButton = new JButton("Login");
-		saveUsernameCheck = new JCheckBox("Benutzername speichern");
-
-		loginTypePanel = makeLoginTypePanel();
-		grid.add(loginTypePanel).expand(0.25, 1).fill(true, true);
-		loginFormPanel = makeLoginFormPanel();
-		grid.add(loginFormPanel).expand(0.75, 1).fill(true, true);
+		txtUsername = new JTextField();
+		txtPassword = new JPasswordField();
+		btnLogin = new JButton("Login");
+		chkSaveUsername = new JCheckBox("Benutzername speichern");
+
+		pnlLoginType = makeLoginTypePanel();
+		grid.add(pnlLoginType).expand(0.25, 1).fill(true, true);
+		pnlLoginForm = makeLoginFormPanel();
+		grid.add(pnlLoginForm).expand(0.75, 1).fill(true, true);
 		grid.nextRow();
 
 		grid.finish(false);
@@ -120,21 +120,21 @@ public abstract class LoginWindowLayout extends JDialog {
 		GridManager grid = new GridManager(loginFormPanel, 2);
 
 		grid.add(new QLabel("Identity Provider"));
-		grid.add(idpCombo).expand(true, false).fill(true, false);
+		grid.add(cboOrganization).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		// label + field for username
 		grid.add(new QLabel("Benutzername"));
-		grid.add(usernameField).expand(true, false).fill(true, false);
+		grid.add(txtUsername).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		// label + field for password
 		grid.add(new QLabel("Passwort"));
-		grid.add(passwordField).expand(true, false).fill(true, false);
+		grid.add(txtPassword).expand(true, false).fill(true, false);
 		grid.nextRow();
 
-		grid.add(loginButton);
-		grid.add(saveUsernameCheck);
+		grid.add(btnLogin);
+		grid.add(chkSaveUsername);
 		grid.nextRow();
 		grid.finish(true);
 		return loginFormPanel;
@@ -145,9 +145,9 @@ public abstract class LoginWindowLayout extends JDialog {
 		loginTypePanel.setLayout(new BoxLayout(loginTypePanel, BoxLayout.PAGE_AXIS));
 		loginTypePanel.setBorder(new TitledBorder(AUTH_TYPE_LABEL));
 		ButtonGroup loginTypeButtonGroup = new ButtonGroup();
-		for (int i = 0; i < loginTypes.length; i++) {
-			loginTypeButtonGroup.add(loginTypes[i]);
-			loginTypePanel.add(loginTypes[i]);
+		for (int i = 0; i < rdoLoginType.length; i++) {
+			loginTypeButtonGroup.add(rdoLoginType[i]);
+			loginTypePanel.add(rdoLoginType[i]);
 		}
 		loginTypePanel.add(Box.createVerticalGlue());
 		loginTypePanel.add(btnSettings);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
index e319550e..002a3fc1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
@@ -25,28 +25,28 @@ public abstract class MainMenuWindowLayout extends CompositePage {
 			+ "2) Zu Veranstaltungen gehörende Virtuelle Maschinen herunterladen<br>&nbsp;</html>";
 
 	// buttons
-	protected JLabel vmImage;
-	protected JLabel lectureImage;
-	protected JButton vmButton;
-	protected JButton lectureButton;
+	protected final JLabel lblVirtualMachinesLogo;
+	protected final JLabel lblLectureLogo;
+	protected final JButton btnShowVirtualMachines;
+	protected final JButton btnShowLectures;
 
 	public MainMenuWindowLayout() {
 		this.setBorder(BorderFactory.createTitledBorder("bwSuite-Hauptmenü"));
 		GridManager grid = new GridManager(this, 2);
 
-		vmImage = new JLabel(ResourceLoader.getIcon("/img/virtualization.png", "VM-Übersicht"));
+		lblVirtualMachinesLogo = new JLabel(ResourceLoader.getIcon("/img/virtualization.png", "VM-Übersicht"));
 		JLabel vmInfoLabel = new JLabel(vmInfo);
 		vmInfoLabel.setVerticalAlignment(JLabel.TOP);
-		lectureImage = new JLabel(ResourceLoader.getIcon("/img/lecture.png", "Veranstaltungen"));
+		lblLectureLogo = new JLabel(ResourceLoader.getIcon("/img/lecture.png", "Veranstaltungen"));
 		JLabel lecturesInfoLabel = new JLabel(lecturesInfo);
 		lecturesInfoLabel.setVerticalAlignment(JLabel.TOP);
-		vmButton = new JButton("Zu den Images");
-		lectureButton = new JButton("Zu den Veranstaltungen");
-		grid.add(vmImage).fill(true, false).expand(true, false);
-		grid.add(lectureImage).fill(true, false).expand(true, false);
+		btnShowVirtualMachines = new JButton("Zu den Images");
+		btnShowLectures = new JButton("Zu den Veranstaltungen");
+		grid.add(lblVirtualMachinesLogo).fill(true, false).expand(true, false);
+		grid.add(lblLectureLogo).fill(true, false).expand(true, false);
 		grid.nextRow();
-		grid.add(vmButton).fill(true, false).expand(true, false);
-		grid.add(lectureButton).fill(true, false).expand(true, false);
+		grid.add(btnShowVirtualMachines).fill(true, false).expand(true, false);
+		grid.add(btnShowLectures).fill(true, false).expand(true, false);
 		grid.nextRow();
 		grid.add(vmInfoLabel).fill(true, true).expand(true, true);
 		grid.add(lecturesInfoLabel).fill(true, true).expand(true, true);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/SatelliteListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/SatelliteListWindowLayout.java
index dd71352f..bf6d1bc5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/SatelliteListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/SatelliteListWindowLayout.java
@@ -4,6 +4,7 @@ import java.awt.BorderLayout;
 import java.awt.Window;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -22,11 +23,11 @@ import org.openslx.dozmod.gui.helper.GridManager;
 @SuppressWarnings("serial")
 public class SatelliteListWindowLayout extends JDialog {
 
-	protected final JButton cancelButton;
-	protected final JButton nextButton;
-	protected final JTextField customIpField;
-	protected final JRadioButton radioCustomIp;
-	protected final HashMap<JRadioButton, Satellite> radioToSat = new HashMap<JRadioButton, Satellite>();
+	protected final JButton btnCancel;
+	protected final JButton btnContinue;
+	protected final JTextField txtCustomAddress;
+	protected final JRadioButton rdoCusomAddress;
+	protected final Map<JRadioButton, Satellite> radioToSat = new HashMap<>();
 
 	private static String title = "Satelliten-Server wählen";
 
@@ -57,11 +58,11 @@ public class SatelliteListWindowLayout extends JDialog {
 		// --------------- custom ip button and field --------------------------------------
 		selectionPanelGrid.add(new JLabel("Server-Adresse selbst eingeben"), 2);
 		selectionPanelGrid.nextRow();
-		radioCustomIp = new JRadioButton("");
-		btnGroup.add(radioCustomIp);
-		customIpField = new JTextField("");
-		selectionPanelGrid.add(radioCustomIp).fill(true, false).expand(false, false);
-		selectionPanelGrid.add(customIpField).fill(true, false).expand(true, false);
+		rdoCusomAddress = new JRadioButton("");
+		btnGroup.add(rdoCusomAddress);
+		txtCustomAddress = new JTextField("");
+		selectionPanelGrid.add(rdoCusomAddress).fill(true, false).expand(false, false);
+		selectionPanelGrid.add(txtCustomAddress).fill(true, false).expand(true, false);
 		selectionPanelGrid.nextRow();
 		// --------------- end custom ip field --------------------------------
 		selectionPanelGrid.finish(false);
@@ -70,11 +71,11 @@ public class SatelliteListWindowLayout extends JDialog {
 		JPanel buttonPane = new JPanel();
 		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
 		buttonPane.setBorder(BorderFactory.createEmptyBorder(1, 3, 3, 3));
-		cancelButton = new JButton("Abbrechen");
-		buttonPane.add(cancelButton);
+		btnCancel = new JButton("Abbrechen");
+		buttonPane.add(btnCancel);
 		buttonPane.add(Box.createHorizontalGlue());
-		nextButton = new JButton("Weiter");
-		buttonPane.add(nextButton);
+		btnContinue = new JButton("Weiter");
+		buttonPane.add(btnContinue);
 		// --------------- end button panel ----------------------------------
 
 		// pack it all
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
index 4f4fd38f..2cb55271 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
@@ -23,9 +23,9 @@ public class UserListWindowLayout extends JDialog {
 
 	protected final UserTable userTable;
 
-	protected final JButton setButton;
-	protected final JButton cancelButton;
-	protected final JTextField searchUserField;
+	protected final JButton btnConfirm;
+	protected final JButton btnCancel;
+	protected final JTextField txtSearch;
 
 	private static String title = "Benutzerliste";
 
@@ -40,8 +40,8 @@ public class UserListWindowLayout extends JDialog {
 		filterPanel.setLayout(new BoxLayout(filterPanel, BoxLayout.LINE_AXIS));
 		filterPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
 		filterPanel.add(new QLabel("Suchen: "));
-		searchUserField = new JTextField();
-		filterPanel.add(searchUserField);
+		txtSearch = new JTextField();
+		filterPanel.add(txtSearch);
 		// --------------- end filter field --------------------------------
 
 		// --------------- user table --------------------------------------
@@ -59,11 +59,11 @@ public class UserListWindowLayout extends JDialog {
 		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
 		buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
 		buttonPane.add(Box.createHorizontalGlue());
-		cancelButton = new JButton("Schließen");
-		buttonPane.add(cancelButton);
+		btnCancel = new JButton("Schließen");
+		buttonPane.add(btnCancel);
 		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
-		setButton = new JButton(buttonCaption);
-		buttonPane.add(setButton);
+		btnConfirm = new JButton(buttonCaption);
+		buttonPane.add(btnConfirm);
 		// --------------- end button panel ----------------------------------
 
 		// pack it all
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
index 620f363a..c999586c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
@@ -24,8 +24,8 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog {
 			+ "</body></html>";
 
 	//	protected JButton windowsDLButton;
-	protected final JButton btnDL;
-	protected final JButton continueButton;
+	protected final JButton btnDownload;
+	protected final JButton btnClose;
 
 	public VirtualizerNoticeWindowLayout(Frame modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
@@ -49,8 +49,8 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog {
 		infoPane.add(Box.createRigidArea(new Dimension(0, 10)));
 
 		// Download buttons
-		btnDL = new JButton("VMWare Player herunterladen");
-		infoPane.add(btnDL);
+		btnDownload = new JButton("VMWare Player herunterladen");
+		infoPane.add(btnDownload);
 
 		// Bottom controls
 		JPanel bottomPane = new JPanel();
@@ -58,8 +58,8 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog {
 
 		bottomPane.add(Box.createHorizontalGlue());
 
-		continueButton = new JButton("Schließen");
-		bottomPane.add(continueButton);
+		btnClose = new JButton("Schließen");
+		bottomPane.add(btnClose);
 
 		grid.add(infoPane).fill(true, true).expand(true, true);
 		grid.nextRow();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
index 659d7919..1d209775 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
@@ -19,10 +19,10 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
 	protected ImageCustomPermissionManager imageCustomPermissionManager;
 
 	// permissions checks
-	protected JCheckBox readPermissionsCheck;
-	protected JCheckBox writePermissionsCheck;
-	protected JCheckBox linkPermissionsCheck;
-	protected JCheckBox adminPermissionsCheck;
+	protected final JCheckBox chkPermissionRead;
+	protected final JCheckBox chkPermissionEdit;
+	protected final JCheckBox chkPermissionLink;
+	protected final JCheckBox chkPermissionAdmin;
 
 	/**
 	 * wizard page for setting custom permissions
@@ -53,16 +53,16 @@ public class ImageCustomPermissionPageLayout extends WizardPage {
 
 		JPanel permissionsPanel = new JPanel();
 		permissionsPanel.setLayout(new BoxLayout(permissionsPanel, BoxLayout.LINE_AXIS));
-		linkPermissionsCheck = new JCheckBox("Verlinken");
-		linkPermissionsCheck.setSelected(true);
-		readPermissionsCheck = new JCheckBox("Download");
-		readPermissionsCheck.setSelected(true);
-		writePermissionsCheck = new JCheckBox("Bearbeiten");
-		adminPermissionsCheck = new JCheckBox("Admin");
-		permissionsPanel.add(linkPermissionsCheck);
-		permissionsPanel.add(readPermissionsCheck);
-		permissionsPanel.add(writePermissionsCheck);
-		permissionsPanel.add(adminPermissionsCheck);
+		chkPermissionLink = new JCheckBox("Verlinken");
+		chkPermissionLink.setSelected(true);
+		chkPermissionRead = new JCheckBox("Download");
+		chkPermissionRead.setSelected(true);
+		chkPermissionEdit = new JCheckBox("Bearbeiten");
+		chkPermissionAdmin = new JCheckBox("Admin");
+		permissionsPanel.add(chkPermissionLink);
+		permissionsPanel.add(chkPermissionRead);
+		permissionsPanel.add(chkPermissionEdit);
+		permissionsPanel.add(chkPermissionAdmin);
 		permissionsPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 0));
 		grid.add(permissionsPanel).fill(true, false).expand(true, false);
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
index 46792063..7e16af9f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
@@ -2,10 +2,8 @@ package org.openslx.dozmod.gui.wizard.layout;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
-import javax.swing.border.TitledBorder;
 
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.dozmod.gui.Gui;
@@ -20,10 +18,10 @@ import org.openslx.thrifthelper.Comparators;
 @SuppressWarnings("serial")
 public abstract class ImageMetaDataPageLayout extends WizardPage {
 
-	protected JComboBox<OperatingSystem> osCombo;
-	protected JTextArea descriptionText;
-	protected JCheckBox licencedSoftwareCheck;
-	protected JCheckBox isTemplateCheck;
+	protected final JComboBox<OperatingSystem> cboOperatingSystem;
+	protected final JTextArea txtDescription;
+	protected final JCheckBox chkLicenseRestricted;
+	protected final JCheckBox chkIsTemplate;
 
 	/**
 	 * wizard page for entering image data at creating or editing an image
@@ -37,7 +35,7 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 		GridManager grid = new GridManager(this, 2, false);
 
 		QLabel osCaption = new QLabel("Betriebssystem");
-		osCombo = new ComboBox<>(Comparators.operatingSystem, new ComboBoxRenderer<OperatingSystem>() {
+		cboOperatingSystem = new ComboBox<>(Comparators.operatingSystem, new ComboBoxRenderer<OperatingSystem>() {
 			@Override
 			public String renderItem(OperatingSystem item) {
 				if (item == null)
@@ -45,37 +43,37 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 				return item.getOsName();
 			}
 		});
-		osCombo.setEditable(false);
+		cboOperatingSystem.setEditable(false);
 		grid.add(osCaption);
-		grid.add(osCombo);
+		grid.add(cboOperatingSystem);
 
 		QLabel descriptionCation = new QLabel("Beschreibung");
-		descriptionText = new JTextArea(5, 50);
-		descriptionText.setMinimumSize(Gui.getScaledDimension(0, 70));
-		descriptionText.setLineWrap(true);
-		descriptionText.setWrapStyleWord(true);
-		JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+		txtDescription = new JTextArea(5, 50);
+		txtDescription.setMinimumSize(Gui.getScaledDimension(0, 70));
+		txtDescription.setLineWrap(true);
+		txtDescription.setWrapStyleWord(true);
+		JScrollPane descPane = new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		descPane.setMinimumSize(descriptionText.getMinimumSize());
+		descPane.setMinimumSize(txtDescription.getMinimumSize());
 		grid.add(descriptionCation);
 		grid.add(descPane).fill(true, false).expand(true, false);
 		grid.nextRow();
 
-		licencedSoftwareCheck = new JCheckBox("Image enthält lizenzpflichtige Software");
-		licencedSoftwareCheck.setSelected(true);
-		grid.add(licencedSoftwareCheck, 2);
+		chkLicenseRestricted = new JCheckBox("Image enthält lizenzpflichtige Software");
+		chkLicenseRestricted.setSelected(true);
+		grid.add(chkLicenseRestricted, 2);
 		grid.nextRow();
 
 		// -- end permissions group --
-		isTemplateCheck = new JCheckBox("Vorlage erstellen");
-		grid.add(isTemplateCheck, 2);
+		chkIsTemplate = new JCheckBox("Vorlage erstellen");
+		grid.add(chkIsTemplate, 2);
 		grid.nextRow();
 
 		grid.finish(true);
 	}
 
 	public String getImageDescription() {
-		return descriptionText.getText();
+		return txtDescription.getText();
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
index 4f4dd58d..ab1e1153 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
@@ -17,11 +17,11 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 @SuppressWarnings("serial")
 public abstract class ImageUploadPageLayout extends WizardPage {
 
-	protected JTextField imageNameTextField;
-	protected JButton imageFileBrowseButton;
-	protected JTextField imageFileTextField;
-	protected JCheckBox softwareLicenseBox;
-	protected QLabel imageNameCaption;
+	protected final JTextField txtImageName;
+	protected final JButton btnBrowseForImage;
+	protected final JTextField txtImageFile;
+	protected final JCheckBox chkLicenseRestricted;
+	protected final QLabel lblImageName;
 
 	/**
 	 * Page for uploading an imagefile
@@ -33,26 +33,26 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 
 		// -- Browse for VM --
 		QLabel imageFileCaption = new QLabel("Virtuelle Maschine");
-		imageFileTextField = new JTextField();
-		imageFileTextField.setEditable(false);
-		imageFileBrowseButton = new JButton("Durchsuchen");
-		imageFileBrowseButton.setMnemonic(KeyEvent.VK_B);
+		txtImageFile = new JTextField();
+		txtImageFile.setEditable(false);
+		btnBrowseForImage = new JButton("Durchsuchen");
+		btnBrowseForImage.setMnemonic(KeyEvent.VK_B);
 		grid.add(imageFileCaption);
-		grid.add(imageFileTextField).fill(true, false).expand(true, false);
-		grid.add(imageFileBrowseButton);
+		grid.add(txtImageFile).fill(true, false).expand(true, false);
+		grid.add(btnBrowseForImage);
 		grid.nextRow();
 
-		imageNameCaption = new QLabel("Name");
-		imageNameTextField = new JTextField();
-		grid.add(imageNameCaption);
-		grid.add(imageNameTextField, 2, 1).fill(true, false).expand(true, false);
+		lblImageName = new QLabel("Name");
+		txtImageName = new JTextField();
+		grid.add(lblImageName);
+		grid.add(txtImageName, 2, 1).fill(true, false).expand(true, false);
 		grid.nextRow();
 
 		// -- Software license changed - shown only in UploadWizard --
-		softwareLicenseBox = new JCheckBox("enthält lizenzpflichtige Software");
-		softwareLicenseBox.setVisible(false);
+		chkLicenseRestricted = new JCheckBox("enthält lizenzpflichtige Software");
+		chkLicenseRestricted.setVisible(false);
 		grid.skip();
-		grid.add(softwareLicenseBox, 2, 1).fill(false, false).expand(true, false);
+		grid.add(chkLicenseRestricted, 2, 1).fill(false, false).expand(true, false);
 		grid.nextRow();
 
 		grid.add(Box.createVerticalGlue(), 3).expand(true, true);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java
index ec82b29e..ecad4d36 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadSummaryPageLayout.java
@@ -12,25 +12,25 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 @SuppressWarnings("serial")
 public class ImageUploadSummaryPageLayout extends WizardPage {
 
-	protected final BlockProgressBar progressBar;
+	protected final BlockProgressBar ctlUploadProgressBar;
 	protected final JCheckBox chkCreateLecture;
-	protected final JLabel infoText;
+	protected final JLabel lblHelpText;
 
 	public ImageUploadSummaryPageLayout(Wizard wizard, boolean allowCreateLecture) {
 		super(wizard, "Fertig!");
 		setDescription("Assistent abgeschlossen");
 		GridManager grid = new GridManager(this, 1);
 
-		progressBar = new BlockProgressBar(null);
-		progressBar.setMinimumSize(progressBar.getPreferredSize());
-		grid.add(progressBar).expand(true, false).fill(true, false);
+		ctlUploadProgressBar = new BlockProgressBar(null);
+		ctlUploadProgressBar.setMinimumSize(ctlUploadProgressBar.getPreferredSize());
+		grid.add(ctlUploadProgressBar).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		grid.add(Box.createVerticalStrut(16));
 		grid.nextRow();
 
-		infoText = new JLabel();
-		grid.add(infoText).expand(true, false).fill(true, false);
+		lblHelpText = new JLabel();
+		grid.add(lblHelpText).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		grid.add(Box.createVerticalGlue()).expand(true, true);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
index aa21a214..f3944cfd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
@@ -24,12 +24,12 @@ import org.openslx.dozmod.util.DateLabelFormatter;
 @SuppressWarnings("serial")
 public abstract class LectureCreationPageLayout extends WizardPage {
 
-	protected final JTextField lectureNameTextField;
-	protected final JTextArea descriptionText;
-	protected final QDatePickerImpl startDate;
-	protected final QDatePickerImpl endDate;
-	protected final JSpinner startTime;
-	protected final JSpinner endTime;
+	protected final JTextField txtName;
+	protected final JTextArea txtDescription;
+	protected final QDatePickerImpl dtpStartDate;
+	protected final QDatePickerImpl dtpEndDate;
+	protected final JSpinner spnStartTime;
+	protected final JSpinner spnEndTime;
 	protected final QLabel lblCalcPeriod;
 
 	private static final Properties pickerStrings = new Properties();
@@ -52,37 +52,37 @@ public abstract class LectureCreationPageLayout extends WizardPage {
 		GridManager grid = new GridManager(this, 3);
 
 		// lecture name
-		lectureNameTextField = new JTextField();
+		txtName = new JTextField();
 		grid.add(new QLabel("Veranstaltungsname"));
-		grid.add(lectureNameTextField, 2).fill(true, false).expand(true, false);
+		grid.add(txtName, 2).fill(true, false).expand(true, false);
 		grid.nextRow();
 
-		descriptionText = new JTextArea(3, 50);
-		descriptionText.setLineWrap(true);
-		descriptionText.setWrapStyleWord(true);
-		JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+		txtDescription = new JTextArea(3, 50);
+		txtDescription.setLineWrap(true);
+		txtDescription.setWrapStyleWord(true);
+		JScrollPane descPane = new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		descriptionText.setMinimumSize(Gui.getScaledDimension(0, 60));
-		descPane.setMinimumSize(descriptionText.getMinimumSize());
+		txtDescription.setMinimumSize(Gui.getScaledDimension(0, 60));
+		descPane.setMinimumSize(txtDescription.getMinimumSize());
 		grid.add(new QLabel("Beschreibung"));
 		grid.add(descPane, 2).fill(true, false).expand(true, false);
 		grid.nextRow();
 
 		// Start date/time
-		startDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+		dtpStartDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
 				new DateLabelFormatter());
-		startTime = makeTimeSpinner(0, 0);
+		spnStartTime = makeTimeSpinner(0, 0);
 		grid.add(new QLabel("Startdatum"));
-		grid.add(startDate).fill(true, false).expand(true, false);
-		grid.add(startTime);
+		grid.add(dtpStartDate).fill(true, false).expand(true, false);
+		grid.add(spnStartTime);
 		grid.nextRow();
 
-		endDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+		dtpEndDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
 				new DateLabelFormatter());
-		endTime = makeTimeSpinner(23, 59);
+		spnEndTime = makeTimeSpinner(23, 59);
 		grid.add(new QLabel("Enddatum"));
-		grid.add(endDate).fill(true, false).expand(true, false);
-		grid.add(endTime);
+		grid.add(dtpEndDate).fill(true, false).expand(true, false);
+		grid.add(spnEndTime);
 		grid.nextRow();
 
 		grid.add(new QLabel("Dauer der Veranstaltung: "));
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java
index b80ef067..849f4a6a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCustomPermissionPageLayout.java
@@ -19,8 +19,8 @@ public abstract class LectureCustomPermissionPageLayout extends WizardPage {
 	protected LectureCustomPermissionManager lectureCustomPermissionManager;
 
 	// permissions checks
-	protected JCheckBox editPermissionsCheck;
-	protected JCheckBox adminPermissionsCheck;
+	protected final JCheckBox chkPermissionEdit;
+	protected final JCheckBox chkPermissionAdmin;
 
 	/**
 	 * Page for setting custom permissions of a lecture
@@ -48,10 +48,10 @@ public abstract class LectureCustomPermissionPageLayout extends WizardPage {
 
 		JPanel permissionsPanel = new JPanel();
 		permissionsPanel.setLayout(new BoxLayout(permissionsPanel, BoxLayout.LINE_AXIS));
-		editPermissionsCheck = new JCheckBox("Bearbeiten");
-		adminPermissionsCheck = new JCheckBox("Admin");
-		permissionsPanel.add(editPermissionsCheck);
-		permissionsPanel.add(adminPermissionsCheck);
+		chkPermissionEdit = new JCheckBox("Bearbeiten");
+		chkPermissionAdmin = new JCheckBox("Admin");
+		permissionsPanel.add(chkPermissionEdit);
+		permissionsPanel.add(chkPermissionAdmin);
 
 		permissionsPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 0));
 		grid.add(permissionsPanel).fill(true, false).expand(true, false);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
index 1b2616d6..5aabd196 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureImageListPageLayout.java
@@ -9,7 +9,7 @@ import org.openslx.dozmod.gui.wizard.WizardPage;
 @SuppressWarnings("serial")
 public abstract class LectureImageListPageLayout extends WizardPage {
 
-	protected final ImageListViewer imageListViewer;
+	protected final ImageListViewer ctlImageList;
 
 	/**
 	 * Page for setting custom permissions of a lecture
@@ -19,8 +19,8 @@ public abstract class LectureImageListPageLayout extends WizardPage {
 		setDescription("Wählen Sie ein Image für diese Veranstaltung aus");
 		GridManager grid = new GridManager(this, 1, false);
 
-		imageListViewer = new ImageListViewer(FilterType.USABLE);
-		grid.add(imageListViewer).fill(true, true).expand(true, true);
+		ctlImageList = new ImageListViewer(FilterType.USABLE);
+		grid.add(ctlImageList).fill(true, true).expand(true, true);
 		grid.finish(false);
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java
index 5ee2a671..929b55b8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureLocationSelectionPageLayout.java
@@ -11,14 +11,14 @@ public class LectureLocationSelectionPageLayout extends WizardPage {
 
 	private final static Logger LOGGER = Logger.getLogger(LectureLocationSelectionPageLayout.class);
 
-	protected final LocationSelector locationSelector;
+	protected final LocationSelector ctlLocationSelector;
 
 	public LectureLocationSelectionPageLayout(Wizard wizard) {
 		super(wizard, "Raumauswahl");
 		setDescription("Bitte wählen Sie die Räume für diese Veranstaltung aus");
-		locationSelector = new LocationSelector();
+		ctlLocationSelector = new LocationSelector();
 		GridManager grid = new GridManager(this, 1);
-		grid.add(locationSelector).fill(true, true).expand(true, true);
+		grid.add(ctlLocationSelector).fill(true, true).expand(true, true);
 		grid.finish(false);
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
index 8726da41..c71ea385 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
@@ -11,10 +11,10 @@ public abstract class LectureOptionsPageLayout extends WizardPage {
 
 	protected static String title = "Zusätzliche Optionen";
 
-	protected JCheckBox networkAccessCheck;
-	protected JCheckBox examCheck;
-	protected JCheckBox autoUpdate;
-	protected JCheckBox enabledCheck;
+	protected final JCheckBox chkInternetEnabled;
+	protected final JCheckBox chkIsExam;
+	protected final JCheckBox chkAutoUpdate;
+	protected final JCheckBox chkIsActive;
 
 	/**
 	 * Page for additional options of lecture
@@ -25,20 +25,20 @@ public abstract class LectureOptionsPageLayout extends WizardPage {
 		GridManager grid = new GridManager(this, 1);
 
 		// Options related to exams
-		examCheck = new JCheckBox("Veranstaltung ist eine Prüfung");
-		grid.add(examCheck);
+		chkIsExam = new JCheckBox("Veranstaltung ist eine Prüfung");
+		grid.add(chkIsExam);
 		grid.nextRow();
 
-		networkAccessCheck = new JCheckBox("Internet verfügbar", true);
-		grid.add(networkAccessCheck);
+		chkInternetEnabled = new JCheckBox("Internet verfügbar", true);
+		grid.add(chkInternetEnabled);
 		grid.nextRow();
 
-		autoUpdate = new JCheckBox("Immer auf aktuellste Imageversion updaten", true);
-		grid.add(autoUpdate);
+		chkAutoUpdate = new JCheckBox("Immer auf aktuellste Imageversion updaten", true);
+		grid.add(chkAutoUpdate);
 		grid.nextRow();
 
-		enabledCheck = new JCheckBox("Vorlesung ist aktiv", true);
-		grid.add(enabledCheck);
+		chkIsActive = new JCheckBox("Vorlesung ist aktiv", true);
+		grid.add(chkIsActive);
 		grid.nextRow();
 
 		grid.finish(true);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java
index 248ba8df..85c508ae 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureRestrictionPageLayout.java
@@ -8,7 +8,6 @@ public class LectureRestrictionPageLayout extends WizardPage {
 
 	public LectureRestrictionPageLayout(Wizard wizard) {
 		super(wizard, "Beschränkungen");
-
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
index a2bbc405..f758156d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java
@@ -27,10 +27,10 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 		super(wizard);
 		setPageComplete(true);
 		this.state = uploadWizardState;
-		linkPermissionsCheck.setSelected(state.defaultPermissions.link);
-		readPermissionsCheck.setSelected(state.defaultPermissions.download);
-		writePermissionsCheck.setSelected(state.defaultPermissions.edit);
-		adminPermissionsCheck.setSelected(state.defaultPermissions.admin);
+		chkPermissionLink.setSelected(state.defaultPermissions.link);
+		chkPermissionRead.setSelected(state.defaultPermissions.download);
+		chkPermissionEdit.setSelected(state.defaultPermissions.edit);
+		chkPermissionAdmin.setSelected(state.defaultPermissions.admin);
 	}
 
 	@Override
@@ -46,9 +46,9 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout {
 	protected boolean wantNextOrFinish() {
 		LOGGER.debug("Saving permissions to state ...");
 		// saving the default permissions
-		state.defaultPermissions = new ImagePermissions(linkPermissionsCheck.isSelected(),
-				readPermissionsCheck.isSelected(), writePermissionsCheck.isSelected(),
-				adminPermissionsCheck.isSelected());
+		state.defaultPermissions = new ImagePermissions(chkPermissionLink.isSelected(),
+				chkPermissionRead.isSelected(), chkPermissionEdit.isSelected(),
+				chkPermissionAdmin.isSelected());
 		// save the table stuff to our upload wizard state
 		Map<String, ImagePermissions> newPermissionMap = imageCustomPermissionManager.updatePermissionReferences();
 		if (newPermissionMap == null || newPermissionMap.isEmpty())
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index 4e87038e..dded2e09 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -33,7 +33,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 		setPageComplete(false);
 		// HACK set fixed uploadWizardState to test functions
 		uploadWizardState.shareMode = ShareMode.LOCAL;
-		isTemplateCheck.setEnabled(Session.isSuperUser());
+		chkIsTemplate.setEnabled(Session.isSuperUser());
 		// fetch the OS list
 		QuickTimer.scheduleOnce(new Task() {
 			List<OperatingSystem> osList = null;
@@ -52,7 +52,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 			}
 		});
 
-		osCombo.addItemListener(new ItemListener() {
+		cboOperatingSystem.addItemListener(new ItemListener() {
 			@Override
 			public void itemStateChanged(ItemEvent e) {
 				if (e.getStateChange() == ItemEvent.SELECTED) {
@@ -61,7 +61,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 			}
 		});
 
-		descriptionText.getDocument().addDocumentListener(new TextChangeListener() {
+		txtDescription.getDocument().addDocumentListener(new TextChangeListener() {
 			@Override
 			public void changed() {
 				reactToUserInput();
@@ -73,20 +73,20 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 	protected void onPageEnter() {
 		// Preselect OS if possible
 		if (state.detectedOs != null) {
-			osCombo.setSelectedItem(state.detectedOs);
+			cboOperatingSystem.setSelectedItem(state.detectedOs);
 		} else if (state.selectedOs == null) {
-			osCombo.setSelectedItem(null);
+			cboOperatingSystem.setSelectedItem(null);
 		}
-		isTemplateCheck.setSelected(state.isTemplate);
-		licencedSoftwareCheck.setSelected(state.isRestricted);
+		chkIsTemplate.setSelected(state.isTemplate);
+		chkLicenseRestricted.setSelected(state.isRestricted);
 		reactToUserInput();
 	}
 
 	@Override
 	protected boolean wantNextOrFinish() {
-		state.selectedOs = (OperatingSystem) osCombo.getSelectedItem();
-		state.isTemplate = isTemplateCheck.isSelected();
-		state.isRestricted = licencedSoftwareCheck.isSelected();
+		state.selectedOs = (OperatingSystem) cboOperatingSystem.getSelectedItem();
+		state.isTemplate = chkIsTemplate.isSelected();
+		state.isRestricted = chkLicenseRestricted.isSelected();
 		return state.selectedOs != null && state.description != null;
 	}
 
@@ -95,7 +95,7 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 	 */
 	private void fillOsCombo(List<OperatingSystem> osList) {
 		for (OperatingSystem os : osList) {
-			osCombo.addItem(os);
+			cboOperatingSystem.addItem(os);
 		}
 	}
 
@@ -105,14 +105,14 @@ public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 	 * and call setPageComplete(bool) accordingly.
 	 */
 	private void reactToUserInput() {
-		if (osCombo.getSelectedIndex() == -1) {
+		if (cboOperatingSystem.getSelectedIndex() == -1) {
 			// OS empty, description input present
 			setWarningMessage("Wählen Sie das Betriebssystem aus.");
 			setPageComplete(false);
 			return;
 		}
 		// evaluate description field
-		state.description = descriptionText.getText();
+		state.description = txtDescription.getText();
 		if (state.description == null || state.description.isEmpty()) {
 			// OS set, no description
 			setWarningMessage("Fügen Sie eine Beschreibung hinzu.");
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
index d6f8c6aa..24fc13f1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java
@@ -50,21 +50,21 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 		this.state = uploadWizardState;
 		this.existingImage = existingImage;
 
-		imageNameCaption.setVisible(existingImage == null);
-		imageNameTextField.setVisible(existingImage == null);
+		lblImageName.setVisible(existingImage == null);
+		txtImageName.setVisible(existingImage == null);
 		// show the licenced software checkbox since we are uploading new version
-		softwareLicenseBox.setVisible(existingImage != null);
-		softwareLicenseBox.setSelected(existingImage != null); // TODO selected by default?
+		chkLicenseRestricted.setVisible(existingImage != null);
+		chkLicenseRestricted.setSelected(existingImage != null); // TODO selected by default?
 
 		// Browse for *.vmx
-		imageFileBrowseButton.addActionListener(new ActionListener() {
+		btnBrowseForImage.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				browseForVm();
 			}
 		});
 
-		imageFileTextField.addMouseListener(new MouseAdapter() {
+		txtImageFile.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				if (e.getClickCount() == 1)
@@ -72,7 +72,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 			}
 		});
 
-		imageFileBrowseButton.requestFocus();
+		btnBrowseForImage.requestFocus();
 	}
 
 	private void browseForVm() {
@@ -136,14 +136,14 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 
 		if (existingImage == null) {
 			// User didn't enter a name yet or didn't change it -> set
-			String imageName = imageNameTextField.getText();
+			String imageName = txtImageName.getText();
 			if (imageName.isEmpty() || imageName.equals(lastDetectedName)) {
-				imageNameTextField.setText(state.meta.getDisplayName());
+				txtImageName.setText(state.meta.getDisplayName());
 			}
 		}
 		lastDetectedName = state.meta.getDisplayName();
 		state.detectedOs = state.meta.getOs();
-		imageFileTextField.setText(file.getAbsolutePath());
+		txtImageFile.setText(file.getAbsolutePath());
 		// let the user know the upload is ready
 		setErrorMessage(null);
 		setDescription("Sie können jetzt den Upload starten.");
@@ -168,7 +168,7 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 		// are we creating a new image? then either:
 		// get the image name either auto filled by VmwareMetaData or by user
 		// get the image name from the image we are uploading a new version of
-		state.name = existingImage != null ? existingImage.getImageName() : imageNameTextField.getText();
+		state.name = existingImage != null ? existingImage.getImageName() : txtImageName.getText();
 
 		// -- create image to get uuid --
 		if (existingImage == null) {
@@ -177,9 +177,9 @@ public class ImageUploadPage extends ImageUploadPageLayout {
 				if (state.uuid == null)
 					return false;
 
-				imageNameTextField.setEnabled(false);
-				imageFileBrowseButton.setEnabled(false);
-				imageFileTextField.setEnabled(false);
+				txtImageName.setEnabled(false);
+				btnBrowseForImage.setEnabled(false);
+				txtImageFile.setEnabled(false);
 			}
 		} else {
 			state.uuid = existingImage.getImageBaseId();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java
index 405214ab..b5db050b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java
@@ -35,7 +35,7 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout {
 			if (!pageIsVisible)
 				return;
 			if (event.progress != null) {
-				progressBar.setStatus(event.progress);
+				ctlUploadProgressBar.setStatus(event.progress);
 			}
 			if (event.state == TransferState.FINISHED) {
 				updateInfoText(null);
@@ -111,7 +111,7 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout {
 		Gui.asyncExec(new Runnable() {
 			@Override
 			public void run() {
-				infoText.setText("<html><body style ='width:100%'>" + t + "</body></html>");
+				lblHelpText.setText("<html><body style ='width:100%'>" + t + "</body></html>");
 				if (initState == UploadInitState.UPLOAD_STARTED) {
 					setPageComplete(true);
 				}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
index c3039fcd..737aa4c0 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCreationPage.java
@@ -42,8 +42,8 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 			}
 		};
 
-		lectureNameTextField.getDocument().addDocumentListener(docListener);
-		descriptionText.getDocument().addDocumentListener(docListener);
+		txtName.getDocument().addDocumentListener(docListener);
+		txtDescription.getDocument().addDocumentListener(docListener);
 
 		// listeners for the date pickers
 		final ActionListener actionListener = new ActionListener() {
@@ -59,10 +59,10 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 				reactToUserInput();
 			}
 		};
-		startTime.addChangeListener(changeListener);
-		endTime.addChangeListener(changeListener);
-		startDate.addActionListener(actionListener);
-		endDate.addActionListener(actionListener);
+		spnStartTime.addChangeListener(changeListener);
+		spnEndTime.addChangeListener(changeListener);
+		dtpStartDate.addActionListener(actionListener);
+		dtpEndDate.addActionListener(actionListener);
 		calculateDatePeriod();
 	}
 
@@ -88,8 +88,8 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 	 * corresponding label.
 	 */
 	private void calculateDatePeriod() {
-		Date start = DateTimeHelper.getDateFrom(startDate, startTime);
-		Date end = DateTimeHelper.getDateFrom(endDate, endTime);
+		Date start = DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime);
+		Date end = DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime);
 		if (end.before(start)) {
 			lblCalcPeriod.setText("Endzeitpunkt ist vor Startzeitpunkt!");
 		} else {
@@ -99,21 +99,21 @@ public class LectureCreationPage extends LectureCreationPageLayout {
 	}
 
 	private boolean isPageValid() {
-		if (lectureNameTextField.getText().isEmpty()) {
+		if (txtName.getText().isEmpty()) {
 			setWarningMessage("Geben Sie einen Veranstaltungsnamen ein.");
 			return false;
 		} else {
-			state.name = lectureNameTextField.getText();
+			state.name = txtName.getText();
 		}
-		if (descriptionText.getText().isEmpty()) {
+		if (txtDescription.getText().isEmpty()) {
 			setWarningMessage("Fügen Sie eine Beschreibung hinzu.");
 			return false;
 		} else {
-			state.description = descriptionText.getText();
+			state.description = txtDescription.getText();
 		}
 		final Date now = new Date();
-		final Date start = DateTimeHelper.getDateFrom(startDate, startTime);
-		final Date end = DateTimeHelper.getDateFrom(endDate, endTime);
+		final Date start = DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime);
+		final Date end = DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime);
 
 		if (start.after(end)) {
 			setWarningMessage("Startzeit ist nach Endzeit!");
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
index 4c57f19d..4500b7e6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java
@@ -27,8 +27,8 @@ public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayo
 	public LectureCustomPermissionPage(Wizard wizard, LectureWizardState state) {
 		super(wizard);
 		this.state = state;
-		editPermissionsCheck.setSelected(state.defaultPermissions.edit);
-		adminPermissionsCheck.setSelected(state.defaultPermissions.admin);
+		chkPermissionEdit.setSelected(state.defaultPermissions.edit);
+		chkPermissionAdmin.setSelected(state.defaultPermissions.admin);
 		setPageComplete(true);
 	}
 
@@ -45,8 +45,8 @@ public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayo
 	protected boolean wantNextOrFinish() {
 		LOGGER.debug("Saving permissions to state ...");
 		// save the table stuff to our upload wizard state
-		state.defaultPermissions.edit = editPermissionsCheck.isSelected();
-		state.defaultPermissions.admin = adminPermissionsCheck.isSelected();
+		state.defaultPermissions.edit = chkPermissionEdit.isSelected();
+		state.defaultPermissions.admin = chkPermissionAdmin.isSelected();
 		Map<String, LecturePermissions> newPermissionMap = lectureCustomPermissionManager.updatePermissionReferences();
 		if (newPermissionMap == null || newPermissionMap.isEmpty()) {
 			return true;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
index 6524705c..9afbe8a6 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureImageListPage.java
@@ -30,7 +30,7 @@ public class LectureImageListPage extends LectureImageListPageLayout {
 	/**
 	 * The image table held by the ImageListViewer
 	 */
-	private final ImageTable imageTable = imageListViewer.getImageTable();
+	private final ImageTable imageTable = ctlImageList.getImageTable();
 
 	/**
 	 * Page for setting custom permissions of a lecture
@@ -67,7 +67,7 @@ public class LectureImageListPage extends LectureImageListPageLayout {
 
 	@Override
 	protected void onPageEnter() {
-		imageListViewer.refreshList(false, 1);
+		ctlImageList.refreshList(false, 1);
 	}
 
 	/**
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java
index 31c2782c..8eebd0bd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureLocationSelectionPage.java
@@ -27,12 +27,12 @@ public class LectureLocationSelectionPage extends LectureLocationSelectionPageLa
 	}
 
 	private boolean updateState() {
-		List<Integer> locations = locationSelector.getSelectedLocationsAsIds();
-		boolean locationExclusive = locationSelector.getOnlyInSelection();
+		List<Integer> locations = ctlLocationSelector.getSelectedLocationsAsIds();
+		boolean locationExclusive = ctlLocationSelector.getOnlyInSelection();
 		if (locations != null && locations.size() > Session.getSatelliteConfig().maxLocationsPerLecture) {
 			setErrorMessage("Zu viele Räume/Orte ausgewählt");
-			locationSelector.setSelectedLocationsAsIds(locations);
-			locationSelector.collapseFullySelectedNodes();
+			ctlLocationSelector.setSelectedLocationsAsIds(locations);
+			ctlLocationSelector.collapseFullySelectedNodes();
 			return false;
 		}
 		state.locations = locations;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
index c77616aa..7a3f1f6e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
@@ -21,8 +21,8 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 		setPageComplete(true);
 
 		//TODO Temporarily disabled until implemented
-		examCheck.setEnabled(false);
-		networkAccessCheck.setEnabled(false);
+		chkIsExam.setEnabled(false);
+		chkInternetEnabled.setEnabled(false);
 	}
 
 	@Override
@@ -34,10 +34,10 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 	 * Set the selected options in state
 	 */
 	private boolean updateState() {
-		state.isExam = examCheck.isSelected();
-		state.autoUpdate = autoUpdate.isSelected();
-		state.internetAccess = networkAccessCheck.isSelected();
-		state.isEnabled = enabledCheck.isSelected();
+		state.isExam = chkIsExam.isSelected();
+		state.autoUpdate = chkAutoUpdate.isSelected();
+		state.internetAccess = chkInternetEnabled.isSelected();
+		state.isEnabled = chkIsActive.isSelected();
 
 		setDescription("Klicken Sie auf 'Weiter' für Berechtigungen oder 'Fertigstellen'.");
 		return true;