Resolve setter/getter null issue, make variable naming for setters/getters consistent.