Standard naming correction