Rename according to _spec name convention