Fixed compiler warning and changed shared object names to be more unique
and meaningful.  Also simplified code.

Change-Id: I4c37a24f949e122528140a3066d4f23945cafea3