Modifying names to make them more intuitive.