Update names for our system