Modified variable names for Scrutinizer