Better naming so easily viewable on GitHub