This changes implemented methods. The rest of the references will go
away with the public headers cleanup.

Change-Id: I82340cd7a4488c4b463489ae98cd9c16de4e7487
Reviewed-by: Michael Bruning <michael.bruning@digia.com>