Fixed some private names and getters setters.