rename functions, delete old code