moving naming conventions, considered internal to topology now