Fixed style and naming conventions

Change-Id: Ibff64f1d0bfce646e9c35cf8530db960db2604ba