Use better naming system.