Replace few more terminology items