Variables and files renamed