Refactoring of variables to bring in line with code style & conventions.

Refactoring of variables to bring in line with the openhab code style & conventions as per the comments of @teichsta
No functional changes