Import and naming updates to client code.

Signed-off-by: Mike Howe <dockter@almuramc.com>