fixed up all rename references