Remove hard-coding of package/component names

Fixes: bug #1208679

Change-Id: I90f5ec62bde4c1fd960e262f4f1556600273232d
Merge "Remove hard-coding of package/component names"