Tidy up and correctly name the spec file