added getters and naming fix