Make the slot naming more consistent and easier to understand.