Merge "Change some variable names to match up with framework"