maybe we could just beef up the name checking