some renames & cleanup

more cleanup