Minor modifications to methods names