Fix multiple definition build errors

Fix multiple definition build errors resulting from a duplicate
module built under a different name

Change-Id: Ie75aa6931dcfd35942f464fb3d9efdbec474be26
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>