Make sure things are named right.