Merge "Ensure variables in database classes are defined, used and correctly cased"