Fix Misuse of Terms