Align variable names with object model