Rename vars and make headers optional