Update block names to only use %s.