Rename some vars -> getters too.
Warnings cleanup