Overhaul naming convention so it's more fluid.