Rename and hide headers option, add spec tests