Rename vars to more descriptive filename