More renaming, cleanup