Slight adjustment on naming.