Updated names for easier comparison