Improves naming, representations