From aac1247eda11d5641f6df2d9ea8ae5226556dbb4 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 31 Dec 2011 21:22:59 +0100
Subject: [PATCH] Replaces 'standalone' with 'isApplication'

---
 XSD/package.xsd                               |  2 +-
 XSD/packageUpdateServer.xsd                   |  6 ++---
 com.woltlab.wcf/package.xml                   |  2 +-
 wcfsetup/install/files/acp/style/wcf.css      | 20 ++++++++--------
 .../files/acp/templates/packageList.tpl       |  8 +++----
 .../acp/templates/packageListDetailed.tpl     |  6 ++---
 .../acp/templates/packageStartInstall.tpl     |  2 +-
 .../packageUninstallationDependencies.tpl     |  4 ++--
 .../acp/templates/packageUpdateSearch.tpl     |  2 +-
 .../templates/packageUpdateSearchResult.tpl   |  4 ++--
 .../files/acp/templates/packageView.tpl       | 14 +++++------
 ...tandalone1.svg => packageApplication1.svg} |  0
 .../form/PackageUpdateSearchForm.class.php    | 23 +++++++++----------
 .../lib/acp/page/CacheListPage.class.php      |  4 ++--
 .../page/PackageListDetailedPage.class.php    |  4 ++--
 .../lib/acp/page/PackageListPage.class.php    |  2 +-
 .../lib/data/option/OptionEditor.class.php    |  2 +-
 .../files/lib/data/package/Package.class.php  |  8 +++----
 .../lib/data/style/StyleEditor.class.php      |  6 ++---
 .../install/files/lib/system/WCFACP.class.php |  6 ++---
 .../files/lib/system/WCFSetup.class.php       |  2 +-
 .../cache/source/DiskCacheSource.class.php    |  2 +-
 .../package/ACPTemplatesFileHandler.class.php |  6 ++---
 .../system/package/PackageArchive.class.php   |  6 ++---
 .../PackageInstallationDispatcher.class.php   | 10 ++++----
 .../PackageInstallationNodeBuilder.class.php  |  4 ++--
 .../package/PackageUpdateDispatcher.class.php | 16 ++++++-------
 ...emplatePackageInstallationPlugin.class.php |  2 +-
 .../FilePackageInstallationPlugin.class.php   |  8 +++----
 ...anguagePackageInstallationPlugin.class.php |  4 ++--
 .../SQLPackageInstallationPlugin.class.php    |  4 ++--
 ...emplatePackageInstallationPlugin.class.php |  2 +-
 wcfsetup/setup/db/install.sql                 |  4 ++--
 33 files changed, 97 insertions(+), 98 deletions(-)
 rename wcfsetup/install/files/icon/{packageStandalone1.svg => packageApplication1.svg} (100%)

diff --git a/XSD/package.xsd b/XSD/package.xsd
index 67ed0b3cf5..dec100fac7 100644
--- a/XSD/package.xsd
+++ b/XSD/package.xsd
@@ -86,7 +86,7 @@
 				</xs:complexType>
 			</xs:element>
 			<xs:element name="packageurl" type="xs:anyURI" minOccurs="0" maxOccurs="1" />
-			<xs:element name="standalone" type="woltlab_boolean" minOccurs="0" maxOccurs="1" />
+			<xs:element name="isapplication" type="woltlab_boolean" minOccurs="0" maxOccurs="1" />
 			<xs:element name="isunique" type="woltlab_boolean" minOccurs="0" maxOccurs="1" />
 			<xs:element name="version" type="woltlab_varchar" minOccurs="1" maxOccurs="1" />
 			<xs:element name="date" type="xs:date" minOccurs="1" maxOccurs="1" />
diff --git a/XSD/packageUpdateServer.xsd b/XSD/packageUpdateServer.xsd
index 6ed4c11cdb..1fd2393812 100644
--- a/XSD/packageUpdateServer.xsd
+++ b/XSD/packageUpdateServer.xsd
@@ -34,7 +34,7 @@
 				<xs:element ref="packagedescription" />
 				<xs:choice minOccurs="0">
 					<xs:element ref="plugin" />
-					<xs:element ref="standalone" />
+					<xs:element ref="isapplication" />
 				</xs:choice>
 			</xs:sequence>
 		</xs:complexType>
@@ -49,8 +49,8 @@
 	<!-- plugin element -->
 	<xs:element name="plugin" type="woltlab_varchar" />
 	
-	<!-- standalone element -->
-	<xs:element name="standalone" type="woltlab_boolean" />
+	<!-- isapplication element -->
+	<xs:element name="isapplication" type="woltlab_boolean" />
 	
 	<!-- author information element -->
 	<xs:element name="authorInformation">
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index cec7d322c9..a5a8949022 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -3,7 +3,7 @@
 	<packageinformation>
 		<packagename>WoltLab Community Framework</packagename>
 		<packagedescription>Free web-framework, designed and developed for complex community applications.</packagedescription>
-		<standalone>1</standalone>
+		<isapplication>1</isapplication>
 		<isunique>1</isunique>
 		<version>2.0.0 Alpha 1</version> <!-- codename: maelstrom -->
 		<date>2011-05-19</date>
diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index deb4208fc9..f25fb4cf80 100644
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -3637,15 +3637,15 @@ input[type='button'][disabled='disabled'],
 
 /* ############## ACP Package List ############## */
 
-/* -- -- -- Package Standalone -- -- -- */
+/* -- -- -- Application Package -- -- -- */
 
 /* Globals */
 
-.infoPackageStandalone {
+.infoPackageApplication {
 	position: relative;
 }
 
-.infoPackageStandalone img.packageStandaloneIcon {
+.infoPackageApplication img.packageApplicationIcon {
 	position: absolute;
 	top: 30px;
 	left: 25px;
@@ -3653,12 +3653,12 @@ input[type='button'][disabled='disabled'],
 	height: 96px;
 }
 
-.infoPackageStandalone div {
+.infoPackageApplication div {
 	margin-bottom: -15px;
 	margin-left: 30px;
 }
 
-.infoPackageStandalone footer {
+.infoPackageApplication footer {
 	position: relative;
 	right: -15px;
 	bottom: -15px;
@@ -3796,14 +3796,14 @@ input[type='button'][disabled='disabled'],
 
 /* -- -- -- Package Footers -- -- -- */
 
-.infoPackageStandalone footer nav,
+.infoPackageApplication footer nav,
 .infoPackagePlugin footer nav {
 	text-align: right;
 }
 
 @media screen and (min-width: 480px), screen and (min-device-width: 480px) {
 	
-	.infoPackageStandalone footer nav,
+	.infoPackageApplication footer nav,
 	.infoPackagePlugin footer nav {
 		opacity: 0;
 		
@@ -3814,7 +3814,7 @@ input[type='button'][disabled='disabled'],
 		transition: opacity .1s linear;
 	}
 	
-	.infoPackageStandalone:hover footer nav,
+	.infoPackageApplication:hover footer nav,
 	.infoPackagePlugin:hover footer nav {
 		opacity: 1;
 	}
@@ -3823,9 +3823,9 @@ input[type='button'][disabled='disabled'],
 
 @media screen and (max-width: 480px), screen and (max-device-width: 480px) {
 	
-	.infoPackageStandalone footer nav,
+	.infoPackageApplication footer nav,
 	.infoPackagePlugin footer nav,
-	.infoPackageStandalone:hover footer nav,
+	.infoPackageApplication:hover footer nav,
 	.infoPackagePlugin:hover footer nav {
 		opacity: 1;
 	}
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 87002962cb..cbe3667785 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -23,7 +23,7 @@
 </script>
 
 <header class="mainHeading">
-	<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" />
+	<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" />
 	<hgroup>
 		<h1>{lang}wcf.acp.package.list{/lang}</h1>
 	</hgroup>
@@ -43,10 +43,10 @@
 		</hgroup>
 		
 		{foreach from=$applications key=packageID item=package}
-			<fieldset class="infoPackageStandalone">
+			<fieldset class="infoPackageApplication">
 				<legend>{$package->getName()}</legend>
 				
-				<img src="{@RELATIVE_WCF_DIR}icon/wcfIcon1.svg" alt="" title="{$package->getName()}" class="packageStandaloneIcon" />
+				<img src="{@RELATIVE_WCF_DIR}icon/wcfIcon1.svg" alt="" title="{$package->getName()}" class="packageApplicationIcon" />
 				
 				<div>
 					<dl>
@@ -115,7 +115,7 @@
 <div class="contentFooter">
 	<nav>
 		<ul class="largeButtons">
-			<li><a href="{link controller='PackageListDetailed'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" /> <span>detailed package list</span></a></li>
+			<li><a href="{link controller='PackageListDetailed'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" /> <span>detailed package list</span></a></li>
 		</ul>
 	</nav>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
index 8d38a26737..d94343c132 100644
--- a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
+++ b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl
@@ -11,7 +11,7 @@
 </script>
 
 <header class="mainHeading">
-	<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" />
+	<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" />
 	<hgroup>
 		<h1>{lang}wcf.acp.package.list{/lang}</h1>
 	</hgroup>
@@ -73,8 +73,8 @@
 						</td>
 						<td class="columnID"><p>{@$package->packageID}</p></td>
 						<td class="columnIcon">
-							{if $package->standalone}
-								<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" class="balloonTooltip" />
+							{if $package->isApplication}
+								<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.list.isApplication{/lang}" class="balloonTooltip" />
 							{elseif $package->isPlugin()}
 								<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="balloonTooltip" />
 							{else}
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 0b8b80aa13..34f98ee90a 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -21,7 +21,7 @@
 <div class="contentHeader">
 	<nav>
 		<ul class="largeButtons">
-			<li><a href="{link controller='PackageList'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
+			<li><a href="{link controller='PackageList'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
 			
 			{event name='largeButtons'}
 		</ul>
diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index 9f05aa6892..c2dda8f6bc 100644
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -107,8 +107,8 @@
 					</td>
 					<td class="columnID"><p>{@$package.packageID}</p></td>
 					<td class="columnIcon">
-						{if $package.standalone}
-							<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" class="balloonTooltip" />
+						{if $package.isApplication}
+							<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.list.isApplication{/lang}" class="balloonTooltip" />
 						{elseif $package.parentPackageID}
 							<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="balloonTooltip" />
 						{else}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index da50bf35fc..95d412b2af 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -97,7 +97,7 @@
 				<dl>
 					<dt>{lang}wcf.acp.packageUpdate.search.type{/lang}</dt>
 					<dd>
-						<label><input type="checkbox" name="standalone" value="1" {if $standalone == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.standalone{/lang}</label> 
+						<label><input type="checkbox" name="isApplication" value="1" {if $isApplication == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.isApplication{/lang}</label> 
 					</dd>
 					<dd>
 						<label><input type="checkbox" name="plugin" value="1" {if $plugin == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.type.plugin{/lang}</label> 
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
index 0dc59368f3..0521b765fc 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
@@ -19,8 +19,8 @@
 			<div class="messageInner container-{cycle name='styles' values='1,2'}">
 				<hgroup class="subHeading">
 					<h1>
-						{if $package.standalone == 1}
-							<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" class="balloonTooltip" />
+						{if $package.isApplication == 1}
+							<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.list.isApplication{/lang}" class="balloonTooltip" />
 						{elseif $package.plugin != ''}
 							<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="balloonTooltip" />
 						{else}
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index f6ab9fd515..ad3a026dd6 100644
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -9,7 +9,7 @@
 </script>
 
 <header class="mainHeading">
-	<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" /><!-- ToDo: Add possibility to show a custom app icon if given! -->
+	<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" /><!-- ToDo: Add possibility to show a custom app icon if given! -->
 	<hgroup>
 		<h1>{$package->getName()}</h1>
 		<h2>{$package->packageDescription}</h2>
@@ -150,8 +150,8 @@
 										</td>
 										<td class="columnID"><p>{@$requiredPackage.packageID}</p></td>
 										<td class="columnIcon">
-											{if $requiredPackage.standalone}
-												<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" class="balloonTooltip" />
+											{if $requiredPackage.isApplication}
+												<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.list.isApplication{/lang}" class="balloonTooltip" />
 											{elseif $requiredPackage.parentPackageID}
 												<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="balloonTooltip" />
 											{else}
@@ -210,8 +210,8 @@
 										</td>
 										<td class="columnID"><p>{@$dependentPackage.packageID}</p></td>
 										<td class="columnIcon">
-											{if $dependentPackage.standalone}
-												<img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" class="balloonTooltip" />
+											{if $dependentPackage.isApplication}
+												<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.list.isApplication{/lang}" class="balloonTooltip" />
 											{elseif $dependentPackage.parentPackageID}
 												<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="balloonTooltip" />
 											{else}
@@ -239,7 +239,7 @@
 {foreach from=$dependentPackages item=dependentPackage}
 	{if $dependentPackage.package != 'com.woltlab.wcf' && $dependentPackage.packageID == PACKAGE_ID}
 		{assign var=noDependentIsActive value=false}
-		{* TODO: maybe show users that this package can't be uninstalled because a dependent package is the active standalone application *}
+		{* TODO: maybe show users that this package can't be uninstalled because a dependent package is the active application *}
 	{/if}
 {/foreach}
 
@@ -249,7 +249,7 @@
 			<ul class="largeButtons">
 				{content}
 					{if PACKAGE_ID != $package->packageID}
-						{if $package->standalone && $package->package != 'com.woltlab.wcf'}
+						{if $package->isApplication && $package->package != 'com.woltlab.wcf'}
 							<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>
 						{/if}
 						{if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}
diff --git a/wcfsetup/install/files/icon/packageStandalone1.svg b/wcfsetup/install/files/icon/packageApplication1.svg
similarity index 100%
rename from wcfsetup/install/files/icon/packageStandalone1.svg
rename to wcfsetup/install/files/icon/packageApplication1.svg
diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php
index c0fc0c55e9..650248bb5d 100644
--- a/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php
@@ -69,14 +69,13 @@ class PackageUpdateSearchForm extends ACPForm {
 	public $plugin = 1;
 	
 	/**
-	 * indicates if standalone applications are searched
+	 * indicates if applications are searched
 	 * @var	integer
 	 */
-	public $standalone = 1;
+	public $isApplication = 1;
 	
 	/**
-	 * indicates if packages that aren't plugins or standalone applications
-	 * are searched
+	 * indicates if packages that aren't plugins or applications are searched
 	 * @var	integer
 	 */
 	public $other = 0;
@@ -105,13 +104,13 @@ class PackageUpdateSearchForm extends ACPForm {
 	public function readFormParameters() {
 		parent::readFormParameters();
 		
-		$this->ignoreUniques = $this->plugin = $this->standalone = 0;
+		$this->ignoreUniques = $this->plugin = $this->isApplication = 0;
 		if (isset($_POST['packageUpdateServerIDs']) && is_array($_POST['packageUpdateServerIDs'])) $this->packageUpdateServerIDs = ArrayUtil::toIntegerArray($_POST['packageUpdateServerIDs']);
 		if (isset($_POST['packageName'])) $this->packageName = StringUtil::trim($_POST['packageName']);
 		if (isset($_POST['author'])) $this->author = StringUtil::trim($_POST['author']);
 		if (isset($_POST['searchDescription'])) $this->searchDescription = intval($_POST['searchDescription']);
 		if (isset($_POST['plugin'])) $this->plugin = intval($_POST['plugin']);
-		if (isset($_POST['standalone'])) $this->standalone = intval($_POST['standalone']);
+		if (isset($_POST['isApplication'])) $this->isApplication = intval($_POST['isApplication']);
 		if (isset($_POST['other'])) $this->other = intval($_POST['other']);
 		if (isset($_POST['ignoreUniques'])) $this->ignoreUniques = intval($_POST['ignoreUniques']);
 	}
@@ -146,9 +145,9 @@ class PackageUpdateSearchForm extends ACPForm {
 		// ignore already installed uniques
 		if ($this->ignoreUniques == 1) $conditions->add("package NOT IN (SELECT package FROM wcf".WCF_N."_package WHERE isUnique = 1)");
 		// package type
-		if (($this->plugin == 0 || $this->standalone == 0 || $this->other == 0) && ($this->plugin == 1 || $this->standalone == 1 || $this->other == 1)) {
-			if ($this->standalone == 1) {
-				$condition = 'standalone = 1';
+		if (($this->plugin == 0 || $this->isApplication == 0 || $this->other == 0) && ($this->plugin == 1 || $this->isApplication == 1 || $this->other == 1)) {
+			if ($this->isApplication == 1) {
+				$condition = 'isApplication = 1';
 				if ($this->plugin == 1) {
 					$condition .= " OR plugin IN (SELECT package FROM wcf".WCF_N."_package)";
 				}
@@ -161,13 +160,13 @@ class PackageUpdateSearchForm extends ACPForm {
 			else if ($this->plugin == 1) {
 				$condition = "plugin IN (SELECT package FROM wcf".WCF_N."_package)";
 				if ($this->other == 1) { 
-					$condition .= " OR standalone = 0";
+					$condition .= " OR isApplication = 0";
 				}
 				
 				$conditions->add('('.$condition.')');
 			}
 			else if ($this->other) {
-				$conditions->add("(standalone = 0 AND plugin = '')");
+				$conditions->add("(isApplication = 0 AND plugin = '')");
 			}
 		}
 		
@@ -268,7 +267,7 @@ class PackageUpdateSearchForm extends ACPForm {
 			'packageName' => $this->packageName,
 			'searchDescription' => $this->searchDescription,
 			'author' => $this->author,
-			'standalone' => $this->standalone,
+			'isApplication' => $this->isApplication,
 			'plugin' => $this->plugin,
 			'other' => $this->other,
 			'packageUpdateServerIDs' => $this->packageUpdateServerIDs,
diff --git a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
index 8b2f735654..1572c0c98a 100755
--- a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
@@ -78,7 +78,7 @@ class CacheListPage extends AbstractPage {
 			
 			$conditions = new PreparedStatementConditionBuilder();
 			$conditions->add("packageID IN (?)", array(PackageDependencyHandler::getDependencies()));
-			$conditions->add("standalone = ?", array(1));
+			$conditions->add("isApplication = ?", array(1));
 			
 			// get package dirs
 			$sql = "SELECT	packageDir
@@ -130,7 +130,7 @@ class CacheListPage extends AbstractPage {
 			
 			$conditions = new PreparedStatementConditionBuilder();
 			$conditions->add("packageID IN (?)", array(PackageDependencyHandler::getDependencies()));
-			$conditions->add("standalone = ?", array(1));
+			$conditions->add("isApplication = ?", array(1));
 			
 			// get package dirs
 			$sql = "SELECT	packageDir, packageName, instanceNo
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php
index fabb7be423..9b9475ccfb 100644
--- a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php
@@ -39,7 +39,7 @@ class PackageListDetailedPage extends SortablePage {
 	/**
 	 * @see wcf\page\SortablePage::$validSortFields
 	 */
-	public $validSortFields = array('packageID', 'package', 'packageDir', 'packageName', 'instanceNo', 'packageDescription', 'packageVersion', 'packageDate', 'packageURL', 'parentPackageID', 'isUnique', 'standalone', 'author', 'authorURL', 'installDate', 'updateDate');
+	public $validSortFields = array('packageID', 'package', 'packageDir', 'packageName', 'instanceNo', 'packageDescription', 'packageVersion', 'packageDate', 'packageURL', 'parentPackageID', 'isUnique', 'isApplication', 'author', 'authorURL', 'installDate', 'updateDate');
 	
 	/**
 	 * @see	wcf\page\MultipleLinkPage::$objectListClassName
@@ -50,7 +50,7 @@ class PackageListDetailedPage extends SortablePage {
 	 * @see	wcf\page\MultipleLinkPage::readObjects()
 	 */	
 	protected function readObjects() {
-		$this->sqlOrderBy = 'package.'.($this->sortField == 'packageType' ? 'standalone '.$this->sortOrder.', package.parentPackageID '.$this->sortOrder : $this->sortField.' '.$this->sortOrder).($this->sortField != 'packageName' ? ', package.packageName ASC' : '');
+		$this->sqlOrderBy = 'package.'.($this->sortField == 'packageType' ? 'isApplication '.$this->sortOrder.', package.parentPackageID '.$this->sortOrder : $this->sortField.' '.$this->sortOrder).($this->sortField != 'packageName' ? ', package.packageName ASC' : '');
 		
 		parent::readObjects();
 	}
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
index 8fa560c8e1..76bf703c61 100755
--- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
@@ -43,7 +43,7 @@ class PackageListPage extends AbstractPage {
 		
 		// read applications
 		$this->applicationList = new PackageList();
-		$this->applicationList->getConditionBuilder()->add("package.standalone = ?", array(1));
+		$this->applicationList->getConditionBuilder()->add("package.isApplication = ?", array(1));
 		$this->applicationList->getConditionBuilder()->add("package.packageID <> ?", array(1));
 		$this->applicationList->sqlLimit = 0;
 		$this->applicationList->readObjects();
diff --git a/wcfsetup/install/files/lib/data/option/OptionEditor.class.php b/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
index 52a5399f99..d40f81f69c 100644
--- a/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
+++ b/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
@@ -88,7 +88,7 @@ class OptionEditor extends DatabaseObjectEditor implements IEditableCachedObject
 		// reset options.inc.php files
 		$sql = "SELECT	package, packageID, packageDir
 			FROM	wcf".WCF_N."_package
-			WHERE	standalone = ?";
+			WHERE	isApplication = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		$statement->execute(array(1));
 		while ($row = $statement->fetchArray()) {
diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php
index 2bb34de3a2..e47df20aa2 100644
--- a/wcfsetup/install/files/lib/data/package/Package.class.php
+++ b/wcfsetup/install/files/lib/data/package/Package.class.php
@@ -467,7 +467,7 @@ class Package extends DatabaseObject {
 	}
 	
 	/**
-	 * Writes the config.inc.php for a standalone application.
+	 * Writes the config.inc.php for an application.
 	 *
 	 * @param	integer		$packageID
 	 */
@@ -478,13 +478,13 @@ class Package extends DatabaseObject {
 		$file->write("<?php\n");
 		$currentPrefix = strtoupper(Package::getAbbreviation($package->package));
 		
-		// get dependencies (only standalones)
+		// get dependencies (only spplications)
 		$sql = "SELECT		package.*, CASE WHEN package.packageID = ? THEN 1 ELSE 0 END AS sortOrder 
 			FROM		wcf".WCF_N."_package_dependency package_dependency
 			LEFT JOIN	wcf".WCF_N."_package package
 			ON		(package.packageID = package_dependency.dependency)
 			WHERE		package_dependency.packageID = ?
-					AND package.standalone = 1
+					AND package.isApplication = 1
 					AND package.packageDir <> ''
 			ORDER BY	sortOrder DESC,
 					package_dependency.priority DESC";
@@ -560,7 +560,7 @@ class Package extends DatabaseObject {
 	public static function getPluginList() {
 		$pluginList = new PackageList();
 		$pluginList->getConditionBuilder()->add("package.packageID IN (?)", array(PackageDependencyHandler::getDependencies()));
-		$pluginList->getConditionBuilder()->add("package.standalone = ?", array(0));
+		$pluginList->getConditionBuilder()->add("package.isApplication = ?", array(0));
 		
 		return $pluginList;
 	}
diff --git a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
index d891c0b2f7..153a0a69f2 100644
--- a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
@@ -389,7 +389,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject
 					$sql = "SELECT	*
 						FROM	wcf".WCF_N."_package
 						WHERE	package = ?
-							AND standalone = ?";
+							AND isApplication = ?";
 					$statement = WCF::getDB()->prepareStatement($sql);
 					$statement->execute(array(
 						$package,
@@ -447,7 +447,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject
 					$sql = "SELECT	*
 						FROM	wcf".WCF_N."_package
 						WHERE	package = ?
-							AND standalone = ?";
+							AND isApplication = ?";
 					$statement = WCF::getDB()->prepareStatement($sql);
 					$statement->execute(array(
 						$package,
@@ -632,7 +632,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject
 			// get package dirs
 			$sql = "SELECT	package, packageDir
 				FROM	wcf".WCF_N."_package
-				WHERE	standalone = 1
+				WHERE	isApplication = 1
 					AND (packageDir <> '' OR package = 'com.woltlab.wcf')";
 			$statement = WCF::getDB()->prepareStatement($sql);
 			$statement->execute();
diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 76142f5e4d..2d969be887 100644
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -130,7 +130,7 @@ class WCFACP extends WCF {
 		$packages = CacheHandler::getInstance()->get('packages');
 		if (isset($_REQUEST['packageID'])) $packageID = intval($_REQUEST['packageID']);
 		
-		if (!isset($packages[$packageID]) || !$packages[$packageID]['standalone']) {
+		if (!isset($packages[$packageID]) || !$packages[$packageID]['isApplication']) {
 			// package id is invalid
 			$packageID = self::getWcfPackageID();
 		}
@@ -158,7 +158,7 @@ class WCFACP extends WCF {
 	}
 	
 	/**
-	 * Returns a list of all installed standalone packages.
+	 * Returns a list of all installed applications packages.
 	 * 
 	 * @return	array
 	 */
@@ -166,7 +166,7 @@ class WCFACP extends WCF {
 		$quickAccessPackages = array();
 		$packages = CacheHandler::getInstance()->get('packages');
 		foreach ($packages as $packageID => $package) {
-			if (!$package->standalone) break;
+			if (!$package->isApplication) break;
 			if ($package->package != 'com.woltlab.wcf') {
 				$quickAccessPackages[] = $package;
 			}
diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 9457492f14..b9de01b9b3 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -1059,7 +1059,7 @@ class WCFSetup extends WCF {
 	}
 	
 	/**
-	 * Gets the package name of the first standalone application in WCFSetup.tar.gz.
+	 * Gets the package name of the first application in WCFSetup.tar.gz.
 	 */
 	protected static function getPackageName() {
 		// get package name
diff --git a/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php
index 5ba9642a01..f08ebeeb7b 100644
--- a/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php
+++ b/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php
@@ -199,7 +199,7 @@ class DiskCacheSource implements ICacheSource {
 			LEFT JOIN	wcf".WCF_N."_package package
 			ON		(package.packageID = package_dependency.dependency)
 			WHERE		package_dependency.packageID = ?
-					AND standalone = ?";
+					AND isApplication = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		$statement->execute(array(
 			PACKAGE_ID,
diff --git a/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php b/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
index e74dc84697..09573f9cb8 100644
--- a/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
+++ b/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
@@ -37,7 +37,7 @@ class ACPTemplatesFileHandler extends PackageInstallationFileHandler {
 				// get by other packages registered files
 				$conditions = new PreparedStatementConditionBuilder();
 				$conditions->add("packageID <> ?", array($packageID));
-				$conditions->add("packageID IN (SELECT packageID FROM wcf".WCF_N."_package WHERE packageDir = ? AND standalone = ?)", array($this->packageInstallation->getPackage()->packageDir, 0));
+				$conditions->add("packageID IN (SELECT packageID FROM wcf".WCF_N."_package WHERE packageDir = ? AND isApplication = ?)", array($this->packageInstallation->getPackage()->packageDir, 0));
 				$conditions->add("templateName IN (?)", array($fileNames));
 				
 				$sql = "SELECT		*
@@ -52,11 +52,11 @@ class ACPTemplatesFileHandler extends PackageInstallationFileHandler {
 				}
 				
 				// check if files from installing package are in conflict with already installed files
-				if (!$this->packageInstallation->getPackage()->standalone && count($lockedFiles) > 0) {
+				if (!$this->packageInstallation->getPackage()->isApplication && count($lockedFiles) > 0) {
 					foreach ($fileNames as $key => $file) {
 						if (isset($lockedFiles[$file]) && $packageID != $lockedFiles[$file]) {
 							$owningPackage = new Package($lockedFiles[$file]);
-							throw new SystemException("A non-standalone package can't overwrite template files. Only an update from the package which owns the template can do that. (Package '".$this->packageInstallation->getPackage()->getPackage()."' tries to overwrite template '".$file."', which is owned by package '".$owningPackage->package."')");
+							throw new SystemException("A non-application package can't overwrite template files. Only an update from the package which owns the template can do that. (Package '".$this->packageInstallation->getPackage()->getPackage()."' tries to overwrite template '".$file."', which is owned by package '".$owningPackage->package."')");
 						}
 					}
 				}
diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
index a8f132aa67..fab8bae64d 100644
--- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
@@ -201,8 +201,8 @@ class PackageArchive {
 					$this->packageInfo[$name][$languageCode] = $element->nodeValue;
 				break;
 				
-				case 'standalone':
-					$this->packageInfo['standalone'] = intval($element->nodeValue);
+				case 'isapplication':
+					$this->packageInfo['isApplication'] = intval($element->nodeValue);
 				break;
 				
 				case 'plugin':
@@ -376,7 +376,7 @@ class PackageArchive {
 		}
 		
 		// set default values
-		if (!isset($this->packageInfo['standalone'])) $this->packageInfo['standalone'] = 0;
+		if (!isset($this->packageInfo['isApplication'])) $this->packageInfo['isApplication'] = 0;
 		if (!isset($this->packageInfo['plugin'])) $this->packageInfo['plugin'] = '';
 		if (!isset($this->packageInfo['packageURL'])) $this->packageInfo['packageURL'] = '';
 		
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index 701a88d8f7..2eb37a2770 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -219,7 +219,7 @@ class PackageInstallationDispatcher {
 			$this->queue = new PackageInstallationQueue($this->queue->queueID);
 			$this->package = null;
 			
-			if ($package->standalone) {
+			if ($package->isApplication) {
 				$host = RouteHandler::getHost();
 				$path = RouteHandler::getPath(array('acp'));
 				
@@ -235,7 +235,7 @@ class PackageInstallationDispatcher {
 			$this->installPackageParent();
 		}
 		
-		if ($this->getPackage()->standalone && $this->getPackage()->package != 'com.woltlab.wcf' && $this->getAction() == 'install') {
+		if ($this->getPackage()->isApplication && $this->getPackage()->package != 'com.woltlab.wcf' && $this->getAction() == 'install') {
 			if (empty($this->getPackage()->packageDir)) {
 				$document = $this->promptPackageDir();
 				if ($document !== null && $document instanceof form\FormDocument) {
@@ -259,8 +259,8 @@ class PackageInstallationDispatcher {
 	 * Sets parent package and rebuilds dependencies for both.
 	 */	
 	protected function installPackageParent() {
-		// do not handle parent package if current package is standalone or does not have a plugin tag while within installation process
-		if ($this->getArchive()->getPackageInfo('standalone') || $this->getAction() != 'install' || !$this->getArchive()->getPackageInfo('plugin')) {
+		// do not handle parent package if current package is an application or does not have a plugin tag while within installation process
+		if ($this->getArchive()->getPackageInfo('isApplication') || $this->getAction() != 'install' || !$this->getArchive()->getPackageInfo('plugin')) {
 			return;
 		}
 		
@@ -421,7 +421,7 @@ class PackageInstallationDispatcher {
 	}
 	
 	/**
-	 * Prompts for a text input for package directory (applies for standalone-applications only)
+	 * Prompts for a text input for package directory (applies for applications only)
 	 *
 	 * @return	FormDocument
 	 */
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
index bc58e64946..3340c5c0b6 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
@@ -393,7 +393,7 @@ class PackageInstallationNodeBuilder {
 				'packageVersion' => $this->installation->getArchive()->getPackageInfo('version'),
 				'packageDate' => $this->installation->getArchive()->getPackageInfo('date'),
 				'packageURL' => $this->installation->getArchive()->getPackageInfo('packageURL'),
-				'standalone' => $this->installation->getArchive()->getPackageInfo('standalone'),
+				'isApplication' => $this->installation->getArchive()->getPackageInfo('isApplication'),
 				'author' => $this->installation->getArchive()->getAuthorInfo('author'),
 				'authorURL' => $this->installation->getArchive()->getAuthorInfo('authorURL') !== null ? $this->installation->getArchive()->getAuthorInfo('authorURL') : '',
 				'installDate' => TIME_NOW,
@@ -480,7 +480,7 @@ class PackageInstallationNodeBuilder {
 		
 		$instructions = ($this->installation->getAction() == 'install') ? $this->installation->getArchive()->getInstallInstructions() : $this->installation->getArchive()->getUpdateInstructions();
 		foreach ($instructions as $pip) {
-			if (isset($pip['attributes']['run']) && ($pip['attributes']['run'] == 'standalone')) {
+			if (isset($pip['attributes']['run']) && ($pip['attributes']['run'] == 'isApplication')) {
 				$this->parentNode = $this->node;
 				$this->node = $this->getToken();
 				$this->sequenceNo = 0;
diff --git a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
index b76916fa59..47faa5fd4d 100644
--- a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
@@ -239,7 +239,7 @@ abstract class PackageUpdateDispatcher {
 		// define default values
 		$packageInfo = array(
 			'packageDescription' => '',
-			'standalone' => 0,
+			'isApplication' => 0,
 			'plugin' => '',
 			'author' => '',
 			'authorURL' => '',
@@ -258,8 +258,8 @@ abstract class PackageUpdateDispatcher {
 					$packageInfo['packageDescription'] = $element->nodeValue;
 				break;
 				
-				case 'standalone':
-					$packageInfo['standalone'] = intval($element->nodeValue);
+				case 'isapplication':
+					$packageInfo['isApplication'] = intval($element->nodeValue);
 				break;
 				
 				case 'plugin':
@@ -396,7 +396,7 @@ abstract class PackageUpdateDispatcher {
 					'packageDescription' => $packageData['packageDescription'],
 					'author' => $packageData['author'],
 					'authorURL' => $packageData['authorURL'],
-					'standalone' => $packageData['standalone'],
+					'isApplication' => $packageData['isApplication'],
 					'plugin' => $packageData['plugin']
 				));
 			}
@@ -409,7 +409,7 @@ abstract class PackageUpdateDispatcher {
 					'packageDescription' => $packageData['packageDescription'],
 					'author' => $packageData['author'],
 					'authorURL' => $packageData['authorURL'],
-					'standalone' => $packageData['standalone'],
+					'isApplication' => $packageData['isapplication'],
 					'plugin' => $packageData['plugin']
 				));
 				
@@ -575,7 +575,7 @@ abstract class PackageUpdateDispatcher {
 		// get existing packages and their versions
 		$existingPackages = array();
 		$sql = "SELECT	packageID, package, instanceNo, packageDescription,
-				packageVersion, packageDate, author, authorURL, standalone,
+				packageVersion, packageDate, author, authorURL, isApplication,
 				CASE WHEN instanceName <> '' THEN instanceName ELSE packageName END AS packageName
 			FROM	wcf".WCF_N."_package";
 		$statement = WCF::getDB()->prepareStatement($sql);
@@ -636,11 +636,11 @@ abstract class PackageUpdateDispatcher {
 			$updates[$packageID]['version'] = end($updates[$packageID]['versions']);
 		}
 		
-		// remove requirements of standalone packages
+		// remove requirements of application packages
 		if ($removeRequirements) {
 			foreach ($existingPackages as $identifier => $instances) {
 				foreach ($instances as $instance) {
-					if ($instance['standalone'] && isset($updates[$instance['packageID']])) {
+					if ($instance['isApplication'] && isset($updates[$instance['packageID']])) {
 						$updates = self::removeUpdateRequirements($updates, $updates[$instance['packageID']]['version']['servers'][0]['packageUpdateVersionID']);
 					}
 				}
diff --git a/wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php
index d63f068cf7..dd0e9b964a 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php
@@ -78,7 +78,7 @@ class ACPTemplatePackageInstallationPlugin extends AbstractPackageInstallationPl
 		if (count($templates) > 0) {
 			// delete template files
 			$packageDir = FileUtil::addTrailingSlash(FileUtil::getRealPath(WCF_DIR.$this->installation->getPackage()->packageDir));
-			$deleteEmptyDirectories = $this->installation->getPackage()->standalone;
+			$deleteEmptyDirectories = $this->installation->getPackage()->isApplication;
 			$this->installation->deleteFiles($packageDir, $templates, false, $deleteEmptyDirectories);
 			
 			// delete log entries
diff --git a/wcfsetup/install/files/lib/system/package/plugin/FilePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/FilePackageInstallationPlugin.class.php
index c6489e76c1..8c5206f550 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/FilePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/FilePackageInstallationPlugin.class.php
@@ -39,8 +39,8 @@ class FilePackageInstallationPlugin extends AbstractPackageInstallationPlugin {
 				// use parents package dir
 				$dir = $this->installation->getPackage()->getParentPackage()->packageDir;
 			}
-			else if ($this->installation->getPackage()->standalone == 1 && $this->installation->getPackage()->package != 'com.woltlab.wcf' && $this->installation->getAction() == 'install') {
-				// standalone package
+			else if ($this->installation->getPackage()->isApplication == 1 && $this->installation->getPackage()->package != 'com.woltlab.wcf' && $this->installation->getAction() == 'install') {
+				// application
 				// prompt package dir
 				$dir = $this->promptPackageDir();
 			}
@@ -67,8 +67,8 @@ class FilePackageInstallationPlugin extends AbstractPackageInstallationPlugin {
 		// extract content of files.tar
 		$fileInstaller = $this->installation->extractFiles($packageDir, $sourceFile, $fileHandler);
 		
-		// if this a standalone package, write config.inc.php for this package
-		if ($this->installation->getPackage()->standalone == 1 && $this->installation->getPackage()->package != 'com.woltlab.wcf' && $this->installation->getAction() == 'install') {
+		// if this a an application, write config.inc.php for this package
+		if ($this->installation->getPackage()->isApplication == 1 && $this->installation->getPackage()->package != 'com.woltlab.wcf' && $this->installation->getAction() == 'install') {
 			// touch file
 			$fileInstaller->touchFile(PackageInstallationDispatcher::CONFIG_FILE);
 			
diff --git a/wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php
index f3f1c01ace..9c2cf36610 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php
@@ -125,8 +125,8 @@ class LanguagePackageInstallationPlugin extends AbstractXMLPackageInstallationPl
 					$languageEditor = new LanguageEditor($language);
 					
 					// import xml
-					// don't update language files if package is standalone
-					$languageEditor->updateFromXML($xml, $this->installation->getPackageID(), !$this->installation->getPackage()->standalone);
+					// don't update language files if package is an application
+					$languageEditor->updateFromXML($xml, $this->installation->getPackageID(), !$this->installation->getPackage()->isApplication);
 					
 					// add language to this package
 					$addedLanguageIDArray[] = $language->languageID;
diff --git a/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php
index a2c40e3f0f..9e2b01306a 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php
@@ -36,8 +36,8 @@ class SQLPackageInstallationPlugin extends AbstractPackageInstallationPlugin {
 				$package = $package->getParentPackage();
 			}
 			
-			if ($package->standalone == 1) {
-				// package is standalone
+			if ($package->isApplication == 1) {
+				// package is application
 				$packageAbbr = Package::getAbbreviation($package->package);
 				$tablePrefix = WCF_N.'_'.$package->instanceNo.'_';
 				
diff --git a/wcfsetup/install/files/lib/system/package/plugin/TemplatePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/TemplatePackageInstallationPlugin.class.php
index b77bc4582a..61693f3263 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/TemplatePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/TemplatePackageInstallationPlugin.class.php
@@ -63,7 +63,7 @@ class TemplatePackageInstallationPlugin extends AbstractPackageInstallationPlugi
 		if (count($templates) > 0) {
 			// delete template files
 			$packageDir = FileUtil::addTrailingSlash(FileUtil::getRealPath(WCF_DIR.$this->installation->getPackage()->packageDir));
-			$deleteEmptyDirectories = $this->installation->getPackage()->standalone;
+			$deleteEmptyDirectories = $this->installation->getPackage()->isApplication;
 			$this->installation->deleteFiles($packageDir, $templates, false, $deleteEmptyDirectories);
 			
 			// delete log entries
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 29ecf6b71a..7077cbf018 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -291,7 +291,7 @@ CREATE TABLE wcf1_package (
 	packageURL VARCHAR(255) NOT NULL DEFAULT '',
 	parentPackageID INT(10) NOT NULL DEFAULT 0,
 	isUnique TINYINT(1) NOT NULL DEFAULT 0,
-	standalone TINYINT(1) NOT NULL DEFAULT 0,
+	isApplication TINYINT(1) NOT NULL DEFAULT 0,
 	author VARCHAR(255) NOT NULL DEFAULT '',
 	authorURL VARCHAR(255) NOT NULL DEFAULT '',
 	KEY package (package)
@@ -398,7 +398,7 @@ CREATE TABLE wcf1_package_update (
 	packageDescription VARCHAR(255) NOT NULL DEFAULT '',
 	author VARCHAR(255) NOT NULL DEFAULT '',
 	authorURL VARCHAR(255) NOT NULL DEFAULT '',
-	standalone TINYINT(1) NOT NULL DEFAULT 0,
+	isApplication TINYINT(1) NOT NULL DEFAULT 0,
 	plugin VARCHAR(255) NOT NULL DEFAULT '',
 	UNIQUE KEY packageUpdateServerID (packageUpdateServerID, package)
 );
-- 
2.20.1