Updating names for clarity