a few more renames to "Complete Themes" because @atsay caught my sloppiness (bug 833584)