Changed public fields to private
Resource rename