prefix a few remaining block names for 1.7