Fix warning and naming.