some renaming
minor edits