diff --git a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
index 3e89ee2abded61bddd68b17352316f75bdbae7de..78910127cb9a0ee0f8e896ffdc29905b028ff071 100644
--- a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
@@ -156,13 +156,17 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
 					if (is_array($row)) {
 						$langRecUids[$langRow['uid']][] = $row['uid'];
 						$status = $row['_HIDDEN'] ? (\TYPO3\CMS\Core\Utility\GeneralUtility::hideIfNotTranslated($data['row']['l18n_cfg']) || $data['row']['l18n_cfg'] & 1 ? 'c-blocked' : 'c-fallback') : 'c-ok';
-						$icon = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('sys_language_overlay', $row, array('class' => 'c-recIcon'));
+						$icon = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord(
+							'pages_language_overlay',
+							$row,
+							array('class' => 'c-recIcon')
+						);
 						$info = $icon . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($row['title'], $titleLen)) . (strcmp($row['nav_title'], '') ? ' [Nav: <em>' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($row['nav_title'], $titleLen)) . '</em>]' : '') . ($row['_COUNT'] > 1 ? '<div>' . $LANG->getLL('lang_renderl10n_badThingThereAre', '1') . '</div>' : '');
 						$tCells[] = '<td class="' . $status . ' c-leftLine">' . $info . '</td>';
 						// Edit whole record:
 						$info = '';
 						$editUid = $row['uid'];
-						$params = '&edit[sys_language_overlay][' . $editUid . ']=edit';
+						$params = '&edit[pages_language_overlay][' . $editUid . ']=edit';
 						$info .= '<a href="#" onclick="' . htmlspecialchars(\TYPO3\CMS\Backend\Utility\BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'])) . '" title="' . $LANG->getLL('lang_renderl10n_editLanguageOverlayRecord', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-open') . '</a>';
 						$info .= '<a href="#" onclick="' . htmlspecialchars(('top.loadEditId(' . intval($data['row']['uid']) . ',"&SET[language]=' . $langRow['uid'] . '"); return false;')) . '" title="' . $LANG->getLL('lang_renderl10n_editPageLang', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-page-open') . '</a>';
 						$info .= str_replace('###LANG_UID###', $langRow['uid'], $viewPageLink);
@@ -177,7 +181,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
 							$status = \TYPO3\CMS\Core\Utility\GeneralUtility::hideIfNotTranslated($data['row']['l18n_cfg']) || $data['row']['l18n_cfg'] & 1 ? 'c-blocked' : 'c-fallback';
 							$info = '<input type="checkbox" name="newOL[' . $langRow['uid'] . '][' . $data['row']['uid'] . ']" value="1" />';
 							$newOL_js[$langRow['uid']] .= '
-								+(document.webinfoForm[\'newOL[' . $langRow['uid'] . '][' . $data['row']['uid'] . ']\'].checked ? \'&edit[sys_language_overlay][' . $data['row']['uid'] . ']=new\' : \'\')
+								+(document.webinfoForm[\'newOL[' . $langRow['uid'] . '][' . $data['row']['uid'] . ']\'].checked ? \'&edit[pages_language_overlay][' . $data['row']['uid'] . ']=new\' : \'\')
 							';
 						}
 						$tCells[] = '<td class="' . $status . ' c-leftLine">&nbsp;</td>';
@@ -208,13 +212,18 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
 				$tCells[] = '<td class="c-leftLine">' . htmlspecialchars($langRow['title']) . '</td>';
 				// Edit language overlay records:
 				if (is_array($langRecUids[$langRow['uid']])) {
-					$params = '&edit[sys_language_overlay][' . implode(',', $langRecUids[$langRow['uid']]) . ']=edit&columnsOnly=title,nav_title,hidden';
+					$params = '&edit[pages_language_overlay][' .
+						implode(',', $langRecUids[$langRow['uid']]) .
+						']=edit&columnsOnly=title,nav_title,hidden';
 					$tCells[] = '<td><a href="#" onclick="' . htmlspecialchars(\TYPO3\CMS\Backend\Utility\BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'])) . '" title="' . $LANG->getLL('lang_renderl10n_editLangOverlays', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-open') . '</a></td>';
 				} else {
 					$tCells[] = '<td>&nbsp;</td>';
 				}
 				// Create new overlay records:
-				$params = '\'' . $newOL_js[$langRow['uid']] . '+\'&columnsOnly=title,hidden,sys_language_uid&defVals[sys_language_overlay][sys_language_uid]=' . $langRow['uid'];
+				$params = '\'' .
+					$newOL_js[$langRow['uid']] .
+					'+\'&columnsOnly=title,hidden,sys_language_uid&defVals[pages_language_overlay][sys_language_uid]=' .
+					$langRow['uid'];
 				$tCells[] = '<td><a href="#" onclick="' . htmlspecialchars(\TYPO3\CMS\Backend\Utility\BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'])) . '" title="' . $LANG->getLL('lang_getlangsta_createNewTranslationHeaders', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-new') . '</a></td>';
 			}
 		}
@@ -263,9 +272,16 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
 	 * @todo Define visibility
 	 */
 	public function getLangStatus($pageId, $langId) {
-		$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_language_overlay', 'pid=' . intval($pageId) . ' AND sys_language_uid=' . intval($langId) . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('sys_language_overlay') . \TYPO3\CMS\Backend\Utility\BackendUtility::versioningPlaceholderClause('sys_language_overlay'));
+		$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+			'*',
+			'pages_language_overlay',
+			'pid=' . intval($pageId) .
+				' AND sys_language_uid=' . intval($langId) .
+				\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('pages_language_overlay') .
+				\TYPO3\CMS\Backend\Utility\BackendUtility::versioningPlaceholderClause('pages_language_overlay')
+		);
 		$row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-		\TYPO3\CMS\Backend\Utility\BackendUtility::workspaceOL('sys_language_overlay', $row);
+		\TYPO3\CMS\Backend\Utility\BackendUtility::workspaceOL('pages_language_overlay', $row);
 		if (is_array($row)) {
 			$row['_COUNT'] = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
 			$row['_HIDDEN'] = $row['hidden'] || intval($row['endtime']) > 0 && intval($row['endtime']) < $GLOBALS['EXEC_TIME'] || $GLOBALS['EXEC_TIME'] < intval($row['starttime']);
@@ -289,4 +305,4 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
 }
 
 
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
index 908840b093bb43f2010d4a199c575874c7c9595e..f6ca36da77b71be6da7546284f1eb34ee6ee203e 100644
--- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
@@ -612,11 +612,20 @@ class AdminPanelView {
 			$params = '&edit[pages][' . $id . ']=edit';
 			$toolBar .= '<a href="' . htmlspecialchars((TYPO3_mainDir . 'alt_doc.php?' . $params . '&noView=1&returnUrl=' . rawurlencode(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('REQUEST_URI')))) . '">' . '<img ' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg(TYPO3_mainDir, 'gfx/edit2.gif', 'width="11" height="12"') . 'hspace="2" border="0" align="top" title="' . $this->extGetLL('edit_editPageProperties') . '" alt="" /></a>';
 			if ($GLOBALS['TSFE']->sys_language_uid && $langAllowed) {
-				$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('uid,pid,t3ver_state', 'sys_language_overlay', 'pid=' . intval($id) . ' AND sys_language_uid=' . $GLOBALS['TSFE']->sys_language_uid . $GLOBALS['TSFE']->sys_page->enableFields('sys_language_overlay'), '', '', '1');
+				$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+					'uid,pid,t3ver_state',
+					'pages_language_overlay',
+					'pid=' . intval($id) .
+						' AND sys_language_uid=' . $GLOBALS['TSFE']->sys_language_uid .
+						$GLOBALS['TSFE']->sys_page->enableFields('pages_language_overlay'),
+					'',
+					'',
+					'1'
+				);
 				$row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-				$GLOBALS['TSFE']->sys_page->versionOL('sys_language_overlay', $row);
+				$GLOBALS['TSFE']->sys_page->versionOL('pages_language_overlay', $row);
 				if (is_array($row)) {
-					$params = '&edit[sys_language_overlay][' . $row['uid'] . ']=edit';
+					$params = '&edit[pages_language_overlay][' . $row['uid'] . ']=edit';
 					$toolBar .= '<a href="' . htmlspecialchars((TYPO3_mainDir . 'alt_doc.php?' . $params . '&noView=1&returnUrl=' . rawurlencode(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('REQUEST_URI')))) . '">' . '<img ' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg(TYPO3_mainDir, 'gfx/edit3.gif', 'width="11" height="12"') . ' hspace="2" border="0" align="top" title="' . $this->extGetLL('edit_editPageOverlay') . '" alt="" /></a>';
 				}
 			}
@@ -649,4 +658,4 @@ class AdminPanelView {
 }
 
 
-?>
\ No newline at end of file
+?>