Changed filename and var names

Changed filename and var names