fix more function name moves
fix objectTypeUri reference