some more name changes and scrapped code