Properly name things in a proper fashion