Adjusted environment to use lowercase names for type/variable matching