some renames & cleanup