removed some of the old namings