Added variable name checking