Fixed types in variable names