Fix issues with namings

Change-Id: I86a2352fd936991552e9e4355a997c3b479f3f8a