minor changes in the naming