Change naming convention to match attr_accessor pattern