Improved some used terms