Overhauled pagination trait to reflect recent decisions on trait coding and naming conventions