Add tests for correct terminology, use correct terminology in PHP