made some naming conventions more file agnostic