Java Code Convention

Variable names changed