Update variable names for best practices