Rename variables to java convention