Oops, forgot to commit all the renamings
Added deprecated classes