Cleaning up Django model naming