some renames; continued cleanup