- more renaming and dist fixes