diff --git a/Makefile b/Makefile
index 0525a81c..06d89818 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-VERSION=1.0.7
+VERSION=0.9.0
 
 .PHONY: dist
-dist: owncloud-ccs.spec
-	rm -rf owncloud-ccs-$(VERSION)
-	mkdir owncloud-ccs-$(VERSION)
+dist: owncloud-collabora-online.spec
+	rm -rf owncloud-collabora-online-$(VERSION)
+	mkdir owncloud-collabora-online-$(VERSION)
 	tar cf -  *.php \
                 appinfo \
                 assets \
@@ -17,10 +17,10 @@ dist: owncloud-ccs.spec
                 l10n \
                 lib \
                 templates \
-                | ( cd owncloud-ccs-$(VERSION) && tar xf - )
-	tar cfz owncloud-ccs-$(VERSION).tar.gz owncloud-ccs-$(VERSION)
-	rm -rf owncloud-ccs-$(VERSION)
+                | ( cd owncloud-collabora-online-$(VERSION) && tar xf - )
+	tar cfz owncloud-collabora-online-$(VERSION).tar.gz owncloud-collabora-online-$(VERSION)
+	rm -rf owncloud-collabora-online-$(VERSION)
 
-owncloud-ccs.spec: owncloud-ccs.spec.in Makefile
-	sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <owncloud-ccs.spec.in >owncloud-ccs.spec
+owncloud-collabora-online.spec: owncloud-collabora-online.spec.in Makefile
+	sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' <owncloud-collabora-online.spec.in >owncloud-collabora-online.spec
 
diff --git a/appinfo/app.php b/appinfo/app.php
index d73c078c..1f73ccfc 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -37,7 +37,7 @@ $navigationEntry = function () use ($c) {
 		'order' => 2,
 		'href' => $c->query('ServerContainer')->getURLGenerator()->linkToRoute('richdocuments.document.index'),
 		'icon' => $c->query('ServerContainer')->getURLGenerator()->imagePath('richdocuments', 'documents.svg'),
-		'name' => $c->query('L10N')->t('Collabora Online Development Edition')
+		'name' => $c->query('L10N')->t('Collabora Online')
 	];
 };
 $c->getServer()->getNavigationManager()->add($navigationEntry);
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4db1815e..be9ad3ac 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <info>
 	<id>richdocuments</id>
-	<name>Collabora Online Development Edition</name>
+	<name>Collabora Online</name>
 	<description>An ownCloud app to work with office documents</description>
 	<licence>AGPL</licence>
-	<version>0.13.0</version>
+	<version>0.9.0</version>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
-	<bugs>https://www.collaboraoffice.com/</bugs>
-	<repository type="git">git://gerrit.libreoffice.org/online.git</repository>
+	<bugs>https://github.com/owncloud/richdocuments/issues</bugs>
+	<repository type="git">https://github.com/owncloud/richdocuments.git</repository>
 	<category>productivity</category>
 	<dependencies>
 		<owncloud min-version="8.1" max-version="9.0" />
diff --git a/owncloud-ccs.spec.in b/owncloud-collabora-online.spec.in
similarity index 100%
rename from owncloud-ccs.spec.in
rename to owncloud-collabora-online.spec.in
diff --git a/templates/admin.php b/templates/admin.php
index 37b74e2d..9d361439 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -1,8 +1,8 @@
 <?php
 script('richdocuments', 'admin');
 ?>
-<div class="section" id="documents">
-	<h2><?php p($l->t('Documents')) ?></h2>
+<div class="section" id="richdocuments">
+	<h2><?php p($l->t('Collabora Online')) ?></h2>
 	<div id="wopi_client">
 		<input type="text" name="wopi_url" id="wopi_url" value="<?php p($_['wopi_url'])?>" style="width:250px;">
 		<br /><em><?php p($l->t('WOPI Client')) ?></em>
diff --git a/templates/personal.php b/templates/personal.php
index d4f41c75..616c97ac 100644
--- a/templates/personal.php
+++ b/templates/personal.php
@@ -1,8 +1,8 @@
 <?php
 script('richdocuments', 'personal');
 ?>
-<div class="section" id="documents-personal">
-	<h2><?php p($l->t('Documents')); ?></h2>
+<div class="section" id="richdocuments-personal">
+	<h2><?php p($l->t('Collabora Online')); ?></h2>
 	<div>
 		<label for="documents-default-path"><?php p($l->t('Save new documents to')) ?></label>
 		<input type="text" id="documents-default-path" value="<?php p($_['save_path']) ?>" /><span class="msg"></span>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 78c9fec1..6b314461 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -5,7 +5,7 @@
 		 timeoutForMediumTests="900"
 		 timeoutForLargeTests="900"
 		>
-	<testsuite name='ownCloud - Documents App Tests'>
+	<testsuite name='ownCloud - Richdocuments App Tests'>
 		<directory suffix='test.php'>.</directory>
 	</testsuite>
 	<!-- filters for code coverage -->
@@ -22,4 +22,4 @@
 		<!-- and this is where your report will be written -->
 		<log type="coverage-clover" target="./clover.xml"/>
 	</logging>
-</phpunit>
\ No newline at end of file
+</phpunit>