Rename methods to remove _file suffix