In fact, there are some places using text name directly, and others 
using this way... I just chose one option. Changed here d0611bc68f080459a6b134c7367fb21e43105c67