diff --git a/include/class.nav.php b/include/class.nav.php
index 4fd2e189f77d210590958367bcf0b7613b4fb314..1648332948ec1a32e5ac9a12aba75827d3087a15 100644
--- a/include/class.nav.php
+++ b/include/class.nav.php
@@ -287,7 +287,7 @@ class UserNav {
                                             'title'=>'Show all tickets');
                 } else {
                     $navs['tickets']=array('desc'=>'View Ticket Thread',
-                                           'href'=>sprintf('tickets.php?id=%d',$user->getTicketID()),
+                                           'href'=>sprintf('tickets.php?id=%d',$user->getTicketId()),
                                            'title'=>'View ticket status');
                 }
             } else {
diff --git a/include/client/open.inc.php b/include/client/open.inc.php
index 75211c0982b687475e41e2b9bc4e738aab1d1a7d..3f070c703d9c32b63fc43ca1f3001aff0207f546 100644
--- a/include/client/open.inc.php
+++ b/include/client/open.inc.php
@@ -4,7 +4,7 @@ $info=array();
 if($thisclient && $thisclient->isValid()) {
     $info=array('name'=>$thisclient->getName(),
                 'email'=>$thisclient->getEmail(),
-                'phone'=>$thisclient->getPhone());
+                'phone'=>$thisclient->getPhoneNumber());
 }
 
 $info=($_POST && $errors)?Format::htmlchars($_POST):$info;
diff --git a/include/client/tickets.inc.php b/include/client/tickets.inc.php
index f9774f54a2a33c2bc5da11589f1846e3edc14005..1c227ba4cdec255b7e75607abfeab143e549d305 100644
--- a/include/client/tickets.inc.php
+++ b/include/client/tickets.inc.php
@@ -101,7 +101,7 @@ if($search)
 $negorder=$order=='DESC'?'ASC':'DESC'; //Negate the sorting
 
 ?>
-<h1>My Tickets</h1>
+<h1>Tickets</h1>
 <br>
 <form action="tickets.php" method="get" id="ticketSearchForm">
     <input type="hidden" name="a"  value="search">
diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 9011a6da0f088b9c099900e5df98a8da604c2096..bcd64b4ae7589582d79b159b205f619248e4ecc1 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -13,8 +13,8 @@ if(!$dept || !$dept->isPublic())
     <tr>
         <td colspan="2" width="100%">
             <h1>
-                Ticket #<?php echo $ticket->getExtId(); ?> &nbsp;
-                <a href="view.php?id=<?php echo $ticket->getExtId(); ?>" title="Reload"><span class="Icon refresh">&nbsp;</span></a>
+                Ticket #<?php echo $ticket->getNumber(); ?> &nbsp;
+                <a href="view.php?id=<?php echo $ticket->getId(); ?>" title="Reload"><span class="Icon refresh">&nbsp;</span></a>
             </h1>
         </td>
     </tr>
diff --git a/login.php b/login.php
index feee86956e7fdc9c6fd0bc23582f5a6d4f1902b0..435eebd93a03e7f4f7d1b75509e3c1685b627a02 100644
--- a/login.php
+++ b/login.php
@@ -25,7 +25,7 @@ if ($_POST) {
     if (($user = UserAuthenticationBackend::process($_POST['lemail'],
                     $_POST['lticket'], $errors))) {
         //XXX: Ticket owner is assumed.
-        @header('Location: tickets.php?id='.$user->getTicketID());
+        @header('Location: tickets.php?id='.$user->getTicketId());
         require_once('tickets.php'); //Just in case of 'header already sent' error.
         exit;
     } elseif(!$errors['err']) {
diff --git a/tickets.php b/tickets.php
index 6444b9cf4c8ebf0ece82793d46ca4da98c657930..78d185579af45cdd361e9b57b0d8c9ad53c65d2b 100644
--- a/tickets.php
+++ b/tickets.php
@@ -23,7 +23,7 @@ if($_REQUEST['id']) {
     if (!($ticket = Ticket::lookup($_REQUEST['id']))) {
         $errors['err']='Unknown or invalid ticket ID.';
     } elseif(!$ticket->checkUserAccess($thisclient)) {
-        $errors['err']='Unknown or invalid ticket ID.'; //Using generic message on purpose!
+        $errors['err']='Unknown or invalid ticket.'; //Using generic message on purpose!
         $ticket=null;
     }
 }
diff --git a/view.php b/view.php
index c7b7eaab71ab2c74fc682a0cb2352c0f33668354..28caa20239f3b9ef3722c7172b9a421f194a71da 100644
--- a/view.php
+++ b/view.php
@@ -23,8 +23,8 @@ if (!$thisclient || !$thisclient->isValid()) {
     // Authenticated user can be of type ticket owner or collaborator
     $errors = array();
     $user =  UserAuthenticationBackend::singleSignOn($errors);
-    if ($user && $user->getTicketID())
-        @header('Location: tickets.php?id='.$user->getTicketID());
+    if ($user && $user->getTicketId())
+        @header('Location: tickets.php?id='.$user->getTicketId());
 }
 //Simply redirecting to tickets.php until multiview is implemented.
 require('tickets.php');