rename all variables to the new naming pattern