More searching and replacing.

Signed-off-by: Ben Fletcher <dciww@gmail.com>