Use better naming on sections