Rename spec and remove implicit subjects