Mass rename - need to correct all affected function references