Make spec file naming consistent