Some renaming in order to make more sense.