Changes names

The names are changed slightly to emphasize readability.