More renaming, minor assembly tweaks