Refactored names of types and functions for article.