Renamed a few instances of _name -> .name, for clarity