Updates variable and file names for consistency and matching