diff --git a/Home.md b/Home.md
index 5f7dd84..7b2c3bf 100644
--- a/Home.md
+++ b/Home.md
@@ -1,4 +1,4 @@
-Welcome to the yubikey-val-server-php wiki!
+Welcome to the yubikey-val wiki!
 
 Currently the following pages exist in the wiki:
 
@@ -13,4 +13,4 @@ Currently the following pages exist in the wiki:
 * [[ValidationProtocolV11]] - Yubico Validation Protocol Version 1.1
 * [[ClientInfoFormat]] - Specification of Client Info Data Format
 * [[ValidationProtocolV10]] - Yubico Validation Protocol Version 1.0
-* [[Troubleshooting]] - Troubleshooting
\ No newline at end of file
+* [[Troubleshooting]] - Troubleshooting
diff --git a/Installation.wiki b/Installation.wiki
index 371ac7a..4fb5bd9 100644
--- a/Installation.wiki
+++ b/Installation.wiki
@@ -114,7 +114,7 @@ The database needs to be initialized as follows:
 
 ```sh
 user@val:~$ echo 'create database ykval' | mysql
-user@val:~$ mysql ykval < /usr/share/doc/ykval/ykval-db.sql 
+user@val:~$ mysql ykval < /usr/share/doc/yubikey-val/ykval-db.sql 
 user@val:~$ 
 ```
 
@@ -149,7 +149,7 @@ The database needs to be initialized as follows:
 ```sh
 user@val:~$ sudo su postgres
 postgres@val:~$ createdb ykval
-postgres@val:~$ psql ykval < /usr/share/doc/ykval/ykval-db.sql 
+postgres@val:~$ psql ykval < /usr/share/doc/yubikey-val/ykval-db.sql 
 postgres@val:~$
 ```
 
@@ -190,8 +190,8 @@ Like this:
 ```sh
 user@val:~/yubikey-val-server-php$ sudo make symlink
 install -d /var/www/wsapi/2.0
-ln -sf /usr/share/ykval/ykval-verify.php /var/www/wsapi/2.0/verify.php
-ln -sf /usr/share/ykval/ykval-sync.php /var/www/wsapi/2.0/sync.php
+ln -sf /usr/share/yubikey-val/ykval-verify.php /var/www/wsapi/2.0/verify.php
+ln -sf /usr/share/yubikey-val/ykval-sync.php /var/www/wsapi/2.0/sync.php
 user@val:~/yubikey-val-server-php$ 
 ```
 
@@ -205,7 +205,7 @@ Set the include path for the queue daemon by creating a file
 
 ```sh
 user@val:~$ sudo sh -c 'cat > /etc/default/ykval-queue'
-DAEMON_ARGS="/etc/ykval:/usr/share/ykval"
+DAEMON_ARGS="/etc/yubico/val:/usr/share/yubikey-val"
 user@val:~$ 
 ```
 
@@ -217,7 +217,7 @@ user@val:~$ sudo sh -c 'cat > /var/www/wsapi/2.0/.htaccess'
 RewriteEngine on
 RewriteRule ^([^/\.\?]+)(\?.*)?$ $1.php$2 [L]
 <IfModule mod_php5.c>
- php_value include_path ".:/etc/ykval:/usr/share/ykval"
+ php_value include_path ".:/etc/yubico/val:/usr/share/yubikey-val"
 </IfModule>
 user@val:~$ sudo ln -s 2.0/.htaccess /var/www/wsapi/.htaccess
 user@val:~$
@@ -234,11 +234,11 @@ place you need to modify the paths.
 You also need to create a ykval-config.php script.  An example file is
 included in YK-VAL package as ykval-config.php
 
-A template is typically installed in /etc/ykval/ykval-config.php-template.
+A template is typically installed in /etc/yubico/val/ykval-config.php-template.
 
 ```sh
-user@val:~$ sudo cp /etc/ykval/ykval-config.php-template /etc/ykval/ykval-config.php
-user@val:~$ sudo emacs -nw /etc/ykval/ykval-config.php
+user@val:~$ sudo cp /etc/yubico/val/ykval-config.php-template /etc/yubico/val/ykval-config.php
+user@val:~$ sudo emacs -nw /etc/yubico/val/ykval-config.php
 ```
 
 Be careful about the user permissions and ownership so that unrelated
diff --git a/RevocationService.wiki b/RevocationService.wiki
index 191deb0..b03cf90 100644
--- a/RevocationService.wiki
+++ b/RevocationService.wiki
@@ -16,7 +16,7 @@ user@val:~/yubikey-val-server-php$
 
 = Configuration =
 
-Add the following to your /etc/ykval/ykval-config.php:
+Add the following to your /etc/yubico/val/ykval-config.php:
 
 ```php
 # For the revoke service.