Normalized naming, simplified calls