rm old naming convetions