Update names and variable names to match