Better wording for specs

@allewun what do you think?
"main-old" should be renamed to "main" then