More commits, renames, and fixes