Fixed variable names and strings