corrections on naming