Alter some var names to match new inspection files naming.