Cosmetic changes of names for comfortable usage.
Add comments.