Proper Labeling Of the Package Name

Change-Id: I0e5d1f4e428ae14dcaf0138d98decc3aa7e6d0f1