minor renaming/fixes