diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php
index d85a3583bf..66b62f3534 100644
--- a/apps/dav/appinfo/app.php
+++ b/apps/dav/appinfo/app.php
@@ -20,7 +20,7 @@
*
*/
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
use Symfony\Component\EventDispatcher\GenericEvent;
$app = new Application();
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index e2688e2f92..ca456b0308 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -10,6 +10,7 @@
+ DAV
appinfo/v1/publicwebdav.php
diff --git a/apps/dav/appinfo/install.php b/apps/dav/appinfo/install.php
index dbb23022b3..8ee55dbbd1 100644
--- a/apps/dav/appinfo/install.php
+++ b/apps/dav/appinfo/install.php
@@ -19,7 +19,7 @@
*
*/
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
$app = new Application();
$app->generateBirthdays();
diff --git a/apps/dav/appinfo/register_command.php b/apps/dav/appinfo/register_command.php
index b3ab25a99e..6010f594e9 100644
--- a/apps/dav/appinfo/register_command.php
+++ b/apps/dav/appinfo/register_command.php
@@ -18,7 +18,7 @@
* along with this program. If not, see
*
*/
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
use OCA\DAV\Command\CreateAddressBook;
use OCA\DAV\Command\CreateCalendar;
use OCA\DAV\Command\SyncBirthdayCalendar;
diff --git a/apps/dav/appinfo/update.php b/apps/dav/appinfo/update.php
index dbb23022b3..8ee55dbbd1 100644
--- a/apps/dav/appinfo/update.php
+++ b/apps/dav/appinfo/update.php
@@ -19,7 +19,7 @@
*
*/
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
$app = new Application();
$app->generateBirthdays();
diff --git a/apps/dav/appinfo/application.php b/apps/dav/lib/AppInfo/Application.php
similarity index 99%
rename from apps/dav/appinfo/application.php
rename to apps/dav/lib/AppInfo/Application.php
index 328f86c877..d44ea22e2f 100644
--- a/apps/dav/appinfo/application.php
+++ b/apps/dav/lib/AppInfo/Application.php
@@ -19,7 +19,7 @@
* along with this program. If not, see
*
*/
-namespace OCA\Dav\AppInfo;
+namespace OCA\DAV\AppInfo;
use OCA\DAV\CalDAV\BirthdayService;
use OCA\DAV\CalDAV\CalDavBackend;
diff --git a/apps/dav/lib/caldav/birthdayservice.php b/apps/dav/lib/CalDAV/BirthdayService.php
similarity index 100%
rename from apps/dav/lib/caldav/birthdayservice.php
rename to apps/dav/lib/CalDAV/BirthdayService.php
diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
similarity index 100%
rename from apps/dav/lib/caldav/caldavbackend.php
rename to apps/dav/lib/CalDAV/CalDavBackend.php
diff --git a/apps/dav/lib/caldav/calendar.php b/apps/dav/lib/CalDAV/Calendar.php
similarity index 100%
rename from apps/dav/lib/caldav/calendar.php
rename to apps/dav/lib/CalDAV/Calendar.php
diff --git a/apps/dav/lib/caldav/calendarhome.php b/apps/dav/lib/CalDAV/CalendarHome.php
similarity index 100%
rename from apps/dav/lib/caldav/calendarhome.php
rename to apps/dav/lib/CalDAV/CalendarHome.php
diff --git a/apps/dav/lib/caldav/calendarroot.php b/apps/dav/lib/CalDAV/CalendarRoot.php
similarity index 100%
rename from apps/dav/lib/caldav/calendarroot.php
rename to apps/dav/lib/CalDAV/CalendarRoot.php
diff --git a/apps/dav/lib/caldav/schedule/imipplugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
similarity index 100%
rename from apps/dav/lib/caldav/schedule/imipplugin.php
rename to apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
diff --git a/apps/dav/lib/carddav/addressbook.php b/apps/dav/lib/CardDAV/AddressBook.php
similarity index 100%
rename from apps/dav/lib/carddav/addressbook.php
rename to apps/dav/lib/CardDAV/AddressBook.php
diff --git a/apps/dav/lib/carddav/addressbookimpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
similarity index 100%
rename from apps/dav/lib/carddav/addressbookimpl.php
rename to apps/dav/lib/CardDAV/AddressBookImpl.php
diff --git a/apps/dav/lib/carddav/addressbookroot.php b/apps/dav/lib/CardDAV/AddressBookRoot.php
similarity index 100%
rename from apps/dav/lib/carddav/addressbookroot.php
rename to apps/dav/lib/CardDAV/AddressBookRoot.php
diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
similarity index 100%
rename from apps/dav/lib/carddav/carddavbackend.php
rename to apps/dav/lib/CardDAV/CardDavBackend.php
diff --git a/apps/dav/lib/carddav/contactsmanager.php b/apps/dav/lib/CardDAV/ContactsManager.php
similarity index 100%
rename from apps/dav/lib/carddav/contactsmanager.php
rename to apps/dav/lib/CardDAV/ContactsManager.php
diff --git a/apps/dav/lib/carddav/converter.php b/apps/dav/lib/CardDAV/Converter.php
similarity index 100%
rename from apps/dav/lib/carddav/converter.php
rename to apps/dav/lib/CardDAV/Converter.php
diff --git a/apps/dav/lib/carddav/plugin.php b/apps/dav/lib/CardDAV/Plugin.php
similarity index 100%
rename from apps/dav/lib/carddav/plugin.php
rename to apps/dav/lib/CardDAV/Plugin.php
diff --git a/apps/dav/lib/carddav/syncjob.php b/apps/dav/lib/CardDAV/SyncJob.php
similarity index 97%
rename from apps/dav/lib/carddav/syncjob.php
rename to apps/dav/lib/CardDAV/SyncJob.php
index 0554af6fbf..b6748c05f5 100644
--- a/apps/dav/lib/carddav/syncjob.php
+++ b/apps/dav/lib/CardDAV/SyncJob.php
@@ -22,7 +22,7 @@
namespace OCA\DAV\CardDAV;
use OC\BackgroundJob\TimedJob;
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
class SyncJob extends TimedJob {
diff --git a/apps/dav/lib/carddav/syncservice.php b/apps/dav/lib/CardDAV/SyncService.php
similarity index 100%
rename from apps/dav/lib/carddav/syncservice.php
rename to apps/dav/lib/CardDAV/SyncService.php
diff --git a/apps/dav/lib/carddav/useraddressbooks.php b/apps/dav/lib/CardDAV/UserAddressBooks.php
similarity index 100%
rename from apps/dav/lib/carddav/useraddressbooks.php
rename to apps/dav/lib/CardDAV/UserAddressBooks.php
diff --git a/apps/dav/lib/carddav/xml/groups.php b/apps/dav/lib/CardDAV/Xml/Groups.php
similarity index 100%
rename from apps/dav/lib/carddav/xml/groups.php
rename to apps/dav/lib/CardDAV/Xml/Groups.php
diff --git a/apps/dav/command/createaddressbook.php b/apps/dav/lib/Command/CreateAddressBook.php
similarity index 100%
rename from apps/dav/command/createaddressbook.php
rename to apps/dav/lib/Command/CreateAddressBook.php
diff --git a/apps/dav/command/createcalendar.php b/apps/dav/lib/Command/CreateCalendar.php
similarity index 100%
rename from apps/dav/command/createcalendar.php
rename to apps/dav/lib/Command/CreateCalendar.php
diff --git a/apps/dav/command/syncbirthdaycalendar.php b/apps/dav/lib/Command/SyncBirthdayCalendar.php
similarity index 100%
rename from apps/dav/command/syncbirthdaycalendar.php
rename to apps/dav/lib/Command/SyncBirthdayCalendar.php
diff --git a/apps/dav/command/syncsystemaddressbook.php b/apps/dav/lib/Command/SyncSystemAddressBook.php
similarity index 100%
rename from apps/dav/command/syncsystemaddressbook.php
rename to apps/dav/lib/Command/SyncSystemAddressBook.php
diff --git a/apps/dav/lib/comments/commentnode.php b/apps/dav/lib/Comments/CommentNode.php
similarity index 100%
rename from apps/dav/lib/comments/commentnode.php
rename to apps/dav/lib/Comments/CommentNode.php
diff --git a/apps/dav/lib/comments/commentsplugin.php b/apps/dav/lib/Comments/CommentsPlugin.php
similarity index 100%
rename from apps/dav/lib/comments/commentsplugin.php
rename to apps/dav/lib/Comments/CommentsPlugin.php
diff --git a/apps/dav/lib/comments/entitycollection.php b/apps/dav/lib/Comments/EntityCollection.php
similarity index 100%
rename from apps/dav/lib/comments/entitycollection.php
rename to apps/dav/lib/Comments/EntityCollection.php
diff --git a/apps/dav/lib/comments/entitytypecollection.php b/apps/dav/lib/Comments/EntityTypeCollection.php
similarity index 100%
rename from apps/dav/lib/comments/entitytypecollection.php
rename to apps/dav/lib/Comments/EntityTypeCollection.php
diff --git a/apps/dav/lib/comments/rootcollection.php b/apps/dav/lib/Comments/RootCollection.php
similarity index 100%
rename from apps/dav/lib/comments/rootcollection.php
rename to apps/dav/lib/Comments/RootCollection.php
diff --git a/apps/dav/lib/connector/legacydavacl.php b/apps/dav/lib/Connector/LegacyDAVACL.php
similarity index 100%
rename from apps/dav/lib/connector/legacydavacl.php
rename to apps/dav/lib/Connector/LegacyDAVACL.php
diff --git a/apps/dav/lib/connector/publicauth.php b/apps/dav/lib/Connector/PublicAuth.php
similarity index 100%
rename from apps/dav/lib/connector/publicauth.php
rename to apps/dav/lib/Connector/PublicAuth.php
diff --git a/apps/dav/lib/connector/sabre/appenabledplugin.php b/apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/appenabledplugin.php
rename to apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php
diff --git a/apps/dav/lib/connector/sabre/auth.php b/apps/dav/lib/Connector/Sabre/Auth.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/auth.php
rename to apps/dav/lib/Connector/Sabre/Auth.php
diff --git a/apps/dav/lib/connector/sabre/blocklegacyclientplugin.php b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/blocklegacyclientplugin.php
rename to apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php
diff --git a/apps/dav/lib/connector/sabre/checksumlist.php b/apps/dav/lib/Connector/Sabre/ChecksumList.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/checksumlist.php
rename to apps/dav/lib/Connector/Sabre/ChecksumList.php
diff --git a/apps/dav/lib/connector/sabre/commentpropertiesplugin.php b/apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/commentpropertiesplugin.php
rename to apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
diff --git a/apps/dav/lib/connector/sabre/copyetagheaderplugin.php b/apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/copyetagheaderplugin.php
rename to apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php
diff --git a/apps/dav/lib/connector/sabre/custompropertiesbackend.php b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/custompropertiesbackend.php
rename to apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php
diff --git a/apps/dav/lib/connector/sabre/davaclplugin.php b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/davaclplugin.php
rename to apps/dav/lib/Connector/Sabre/DavAclPlugin.php
diff --git a/apps/dav/lib/connector/sabre/directory.php b/apps/dav/lib/Connector/Sabre/Directory.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/directory.php
rename to apps/dav/lib/Connector/Sabre/Directory.php
diff --git a/apps/dav/lib/connector/sabre/dummygetresponseplugin.php b/apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/dummygetresponseplugin.php
rename to apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php
diff --git a/apps/dav/lib/connector/sabre/exception/entitytoolarge.php b/apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/exception/entitytoolarge.php
rename to apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php
diff --git a/apps/dav/lib/connector/sabre/exception/filelocked.php b/apps/dav/lib/Connector/Sabre/Exception/FileLocked.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/exception/filelocked.php
rename to apps/dav/lib/Connector/Sabre/Exception/FileLocked.php
diff --git a/apps/dav/lib/connector/sabre/exception/forbidden.php b/apps/dav/lib/Connector/Sabre/Exception/Forbidden.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/exception/forbidden.php
rename to apps/dav/lib/Connector/Sabre/Exception/Forbidden.php
diff --git a/apps/dav/lib/connector/sabre/exception/invalidpath.php b/apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/exception/invalidpath.php
rename to apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php
diff --git a/apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php b/apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php
rename to apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php
diff --git a/apps/dav/lib/connector/sabre/exceptionloggerplugin.php b/apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/exceptionloggerplugin.php
rename to apps/dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php
diff --git a/apps/dav/lib/connector/sabre/fakelockerplugin.php b/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/fakelockerplugin.php
rename to apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php
diff --git a/apps/dav/lib/connector/sabre/file.php b/apps/dav/lib/Connector/Sabre/File.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/file.php
rename to apps/dav/lib/Connector/Sabre/File.php
diff --git a/apps/dav/lib/connector/sabre/filesplugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/filesplugin.php
rename to apps/dav/lib/Connector/Sabre/FilesPlugin.php
diff --git a/apps/dav/lib/connector/sabre/filesreportplugin.php b/apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/filesreportplugin.php
rename to apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
diff --git a/apps/dav/lib/connector/sabre/lockplugin.php b/apps/dav/lib/Connector/Sabre/LockPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/lockplugin.php
rename to apps/dav/lib/Connector/Sabre/LockPlugin.php
diff --git a/apps/dav/lib/connector/sabre/maintenanceplugin.php b/apps/dav/lib/Connector/Sabre/MaintenancePlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/maintenanceplugin.php
rename to apps/dav/lib/Connector/Sabre/MaintenancePlugin.php
diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/Connector/Sabre/Node.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/node.php
rename to apps/dav/lib/Connector/Sabre/Node.php
diff --git a/apps/dav/lib/connector/sabre/objecttree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/objecttree.php
rename to apps/dav/lib/Connector/Sabre/ObjectTree.php
diff --git a/apps/dav/lib/connector/sabre/principal.php b/apps/dav/lib/Connector/Sabre/Principal.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/principal.php
rename to apps/dav/lib/Connector/Sabre/Principal.php
diff --git a/apps/dav/lib/connector/sabre/quotaplugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/quotaplugin.php
rename to apps/dav/lib/Connector/Sabre/QuotaPlugin.php
diff --git a/apps/dav/lib/connector/sabre/server.php b/apps/dav/lib/Connector/Sabre/Server.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/server.php
rename to apps/dav/lib/Connector/Sabre/Server.php
diff --git a/apps/dav/lib/connector/sabre/serverfactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/serverfactory.php
rename to apps/dav/lib/Connector/Sabre/ServerFactory.php
diff --git a/apps/dav/lib/connector/sabre/sharetypelist.php b/apps/dav/lib/Connector/Sabre/ShareTypeList.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/sharetypelist.php
rename to apps/dav/lib/Connector/Sabre/ShareTypeList.php
diff --git a/apps/dav/lib/connector/sabre/sharesplugin.php b/apps/dav/lib/Connector/Sabre/SharesPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/sharesplugin.php
rename to apps/dav/lib/Connector/Sabre/SharesPlugin.php
diff --git a/apps/dav/lib/connector/sabre/taglist.php b/apps/dav/lib/Connector/Sabre/TagList.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/taglist.php
rename to apps/dav/lib/Connector/Sabre/TagList.php
diff --git a/apps/dav/lib/connector/sabre/tagsplugin.php b/apps/dav/lib/Connector/Sabre/TagsPlugin.php
similarity index 100%
rename from apps/dav/lib/connector/sabre/tagsplugin.php
rename to apps/dav/lib/Connector/Sabre/TagsPlugin.php
diff --git a/apps/dav/lib/dav/groupprincipalbackend.php b/apps/dav/lib/DAV/GroupPrincipalBackend.php
similarity index 100%
rename from apps/dav/lib/dav/groupprincipalbackend.php
rename to apps/dav/lib/DAV/GroupPrincipalBackend.php
diff --git a/apps/dav/lib/dav/sharing/backend.php b/apps/dav/lib/DAV/Sharing/Backend.php
similarity index 100%
rename from apps/dav/lib/dav/sharing/backend.php
rename to apps/dav/lib/DAV/Sharing/Backend.php
diff --git a/apps/dav/lib/dav/sharing/ishareable.php b/apps/dav/lib/DAV/Sharing/IShareable.php
similarity index 100%
rename from apps/dav/lib/dav/sharing/ishareable.php
rename to apps/dav/lib/DAV/Sharing/IShareable.php
diff --git a/apps/dav/lib/dav/sharing/plugin.php b/apps/dav/lib/DAV/Sharing/Plugin.php
similarity index 100%
rename from apps/dav/lib/dav/sharing/plugin.php
rename to apps/dav/lib/DAV/Sharing/Plugin.php
diff --git a/apps/dav/lib/dav/sharing/xml/invite.php b/apps/dav/lib/DAV/Sharing/Xml/Invite.php
similarity index 100%
rename from apps/dav/lib/dav/sharing/xml/invite.php
rename to apps/dav/lib/DAV/Sharing/Xml/Invite.php
diff --git a/apps/dav/lib/dav/sharing/xml/sharerequest.php b/apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php
similarity index 100%
rename from apps/dav/lib/dav/sharing/xml/sharerequest.php
rename to apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php
diff --git a/apps/dav/lib/dav/systemprincipalbackend.php b/apps/dav/lib/DAV/SystemPrincipalBackend.php
similarity index 100%
rename from apps/dav/lib/dav/systemprincipalbackend.php
rename to apps/dav/lib/DAV/SystemPrincipalBackend.php
diff --git a/apps/dav/lib/files/browsererrorpageplugin.php b/apps/dav/lib/Files/BrowserErrorPagePlugin.php
similarity index 100%
rename from apps/dav/lib/files/browsererrorpageplugin.php
rename to apps/dav/lib/Files/BrowserErrorPagePlugin.php
diff --git a/apps/dav/lib/files/custompropertiesbackend.php b/apps/dav/lib/Files/CustomPropertiesBackend.php
similarity index 100%
rename from apps/dav/lib/files/custompropertiesbackend.php
rename to apps/dav/lib/Files/CustomPropertiesBackend.php
diff --git a/apps/dav/lib/files/fileshome.php b/apps/dav/lib/Files/FilesHome.php
similarity index 100%
rename from apps/dav/lib/files/fileshome.php
rename to apps/dav/lib/Files/FilesHome.php
diff --git a/apps/dav/lib/files/rootcollection.php b/apps/dav/lib/Files/RootCollection.php
similarity index 100%
rename from apps/dav/lib/files/rootcollection.php
rename to apps/dav/lib/Files/RootCollection.php
diff --git a/apps/dav/lib/files/sharing/publiclinkcheckplugin.php b/apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php
similarity index 100%
rename from apps/dav/lib/files/sharing/publiclinkcheckplugin.php
rename to apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php
diff --git a/apps/dav/lib/hookmanager.php b/apps/dav/lib/HookManager.php
similarity index 100%
rename from apps/dav/lib/hookmanager.php
rename to apps/dav/lib/HookManager.php
diff --git a/apps/dav/lib/rootcollection.php b/apps/dav/lib/RootCollection.php
similarity index 100%
rename from apps/dav/lib/rootcollection.php
rename to apps/dav/lib/RootCollection.php
diff --git a/apps/dav/lib/server.php b/apps/dav/lib/Server.php
similarity index 100%
rename from apps/dav/lib/server.php
rename to apps/dav/lib/Server.php
diff --git a/apps/dav/lib/systemtag/systemtagmappingnode.php b/apps/dav/lib/SystemTag/SystemTagMappingNode.php
similarity index 100%
rename from apps/dav/lib/systemtag/systemtagmappingnode.php
rename to apps/dav/lib/SystemTag/SystemTagMappingNode.php
diff --git a/apps/dav/lib/systemtag/systemtagnode.php b/apps/dav/lib/SystemTag/SystemTagNode.php
similarity index 100%
rename from apps/dav/lib/systemtag/systemtagnode.php
rename to apps/dav/lib/SystemTag/SystemTagNode.php
diff --git a/apps/dav/lib/systemtag/systemtagplugin.php b/apps/dav/lib/SystemTag/SystemTagPlugin.php
similarity index 100%
rename from apps/dav/lib/systemtag/systemtagplugin.php
rename to apps/dav/lib/SystemTag/SystemTagPlugin.php
diff --git a/apps/dav/lib/systemtag/systemtagsbyidcollection.php b/apps/dav/lib/SystemTag/SystemTagsByIdCollection.php
similarity index 100%
rename from apps/dav/lib/systemtag/systemtagsbyidcollection.php
rename to apps/dav/lib/SystemTag/SystemTagsByIdCollection.php
diff --git a/apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
similarity index 100%
rename from apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php
rename to apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
diff --git a/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php
similarity index 100%
rename from apps/dav/lib/systemtag/systemtagsobjecttypecollection.php
rename to apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php
diff --git a/apps/dav/lib/systemtag/systemtagsrelationscollection.php b/apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php
similarity index 100%
rename from apps/dav/lib/systemtag/systemtagsrelationscollection.php
rename to apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php
diff --git a/apps/dav/lib/upload/assemblystream.php b/apps/dav/lib/Upload/AssemblyStream.php
similarity index 100%
rename from apps/dav/lib/upload/assemblystream.php
rename to apps/dav/lib/Upload/AssemblyStream.php
diff --git a/apps/dav/lib/upload/futurefile.php b/apps/dav/lib/Upload/FutureFile.php
similarity index 100%
rename from apps/dav/lib/upload/futurefile.php
rename to apps/dav/lib/Upload/FutureFile.php
diff --git a/apps/dav/lib/upload/rootcollection.php b/apps/dav/lib/Upload/RootCollection.php
similarity index 100%
rename from apps/dav/lib/upload/rootcollection.php
rename to apps/dav/lib/Upload/RootCollection.php
diff --git a/apps/dav/lib/upload/uploadfolder.php b/apps/dav/lib/Upload/UploadFolder.php
similarity index 100%
rename from apps/dav/lib/upload/uploadfolder.php
rename to apps/dav/lib/Upload/UploadFolder.php
diff --git a/apps/dav/lib/upload/uploadhome.php b/apps/dav/lib/Upload/UploadHome.php
similarity index 100%
rename from apps/dav/lib/upload/uploadhome.php
rename to apps/dav/lib/Upload/UploadHome.php
diff --git a/apps/dav/tests/unit/appinfo/applicationtest.php b/apps/dav/tests/unit/appinfo/applicationtest.php
index 7f533a185d..05dd75b2c6 100644
--- a/apps/dav/tests/unit/appinfo/applicationtest.php
+++ b/apps/dav/tests/unit/appinfo/applicationtest.php
@@ -21,7 +21,7 @@
namespace OCA\DAV\Tests\Unit\AppInfo;
-use OCA\Dav\AppInfo\Application;
+use OCA\DAV\AppInfo\Application;
use OCP\Contacts\IManager;
use Test\TestCase;