Fixed entity package names to adhere to proper naming convention

Change-Id: I0d9fe73f8df06e5d904f2841ba3e85087038dc1b