Update some naming