Remove meat of specs. Renaming