Fix specs for obsolete definitions