renamed remaining func changes from cyclus