Rename project; a couple other minor edits