rename specs, fix parts of syntax errors